diff --git a/packages/ipfs/src/core/runtime/libp2p-browser.js b/packages/ipfs/src/core/runtime/libp2p-browser.js
index c26f4faa4e..3b159766be 100644
--- a/packages/ipfs/src/core/runtime/libp2p-browser.js
+++ b/packages/ipfs/src/core/runtime/libp2p-browser.js
@@ -35,14 +35,13 @@ module.exports = () => {
     config: {
       peerDiscovery: {
         autoDial: true,
+        // [Bootstrap.tag] = 'bootstrap'
         bootstrap: {
           enabled: true
         },
+        // [WebRTCStar.discovery.tag]
         webRTCStar: {
           enabled: true
-        },
-        websocketStar: {
-          enabled: true
         }
       },
       dht: {
diff --git a/packages/ipfs/src/core/runtime/libp2p-nodejs.js b/packages/ipfs/src/core/runtime/libp2p-nodejs.js
index 33f11d42bd..192155d549 100644
--- a/packages/ipfs/src/core/runtime/libp2p-nodejs.js
+++ b/packages/ipfs/src/core/runtime/libp2p-nodejs.js
@@ -38,14 +38,14 @@ module.exports = () => {
     config: {
       peerDiscovery: {
         autoDial: true,
-        mdns: {
+        [MulticastDNS.tag]: {
           enabled: true
         },
+        // Optimization
+        // Requiring bootstrap inline in components/libp2p to reduce the cli execution time
+        // [Bootstrap.tag] = 'bootstrap'
         bootstrap: {
           enabled: true
-        },
-        websocketStar: {
-          enabled: true
         }
       },
       dht: {
diff --git a/packages/ipfs/test/core/libp2p.spec.js b/packages/ipfs/test/core/libp2p.spec.js
index 549aedbc75..27c8928aa4 100644
--- a/packages/ipfs/test/core/libp2p.spec.js
+++ b/packages/ipfs/test/core/libp2p.spec.js
@@ -144,9 +144,6 @@ describe('libp2p customization', function () {
           },
           webRTCStar: {
             enabled: false
-          },
-          websocketStar: {
-            enabled: true
           }
         },
         pubsub: {