diff --git a/simulations/mixnet/config.toml b/simulations/mixnet/config.toml
index 2d9528c88..bd051cff1 100644
--- a/simulations/mixnet/config.toml
+++ b/simulations/mixnet/config.toml
@@ -5,10 +5,10 @@ filter = true
 store = false
 lightpush = true
 max-connections = 150
-peer-exchange = true
+peer-exchange = false
 metrics-logging = false
 cluster-id = 2
-discv5-discovery = true
+discv5-discovery = false
 discv5-udp-port = 9000
 discv5-enr-auto-update = true
 enable-kad-discovery = true
@@ -20,7 +20,7 @@ shard = [0]
 agent-string = "nwaku-mix"
 nodekey = "f98e3fba96c32e8d1967d460f1b79457380e1a895f7971cecc8528abe733781a"
 mixkey = "a87db88246ec0eedda347b9b643864bee3d6933eb15ba41e6d58cb678d813258"
-rendezvous = true
+rendezvous = false
 listen-address = "127.0.0.1"
 nat = "extip:127.0.0.1"
 ext-multiaddr = ["/ip4/127.0.0.1/tcp/60001"]
diff --git a/simulations/mixnet/config1.toml b/simulations/mixnet/config1.toml
index 19a2960e8..73cccb8c6 100644
--- a/simulations/mixnet/config1.toml
+++ b/simulations/mixnet/config1.toml
@@ -5,10 +5,10 @@ filter = true
 store = false
 lightpush = true
 max-connections = 150
-peer-exchange = true
+peer-exchange = false
 metrics-logging = false
 cluster-id = 2
-discv5-discovery = true
+discv5-discovery = false
 discv5-udp-port = 9001
 discv5-enr-auto-update = true
 discv5-bootstrap-node = ["enr:-LG4QBaAbcA921hmu3IrreLqGZ4y3VWCjBCgNN9mpX9vqkkbSrM3HJHZTXnb5iVXgc5pPtDhWLxkB6F3yY25hSwMezkEgmlkgnY0gmlwhH8AAAGKbXVsdGlhZGRyc4oACATAqEQ-BuphgnJzhQACAQAAiXNlY3AyNTZrMaEDpEW1UlUGHRJg6g_zGuCddKWmIUBGZCQX13xGfh9J6KiDdGNwguphg3VkcIIjKYV3YWt1Mg0"]
@@ -21,7 +21,7 @@ shard = [0]
 agent-string = "nwaku-mix"
 nodekey = "09e9d134331953357bd38bbfce8edb377f4b6308b4f3bfbe85c610497053d684"
 mixkey = "c86029e02c05a7e25182974b519d0d52fcbafeca6fe191fbb64857fb05be1a53"
-rendezvous = true
+rendezvous = false
 listen-address = "127.0.0.1"
 nat = "extip:127.0.0.1"
 ext-multiaddr = ["/ip4/127.0.0.1/tcp/60002"]
diff --git a/simulations/mixnet/config2.toml b/simulations/mixnet/config2.toml
index a10f8cb11..c40e41103 100644
--- a/simulations/mixnet/config2.toml
+++ b/simulations/mixnet/config2.toml
@@ -5,10 +5,10 @@ filter = true
 store = false
 lightpush = true
 max-connections = 150
-peer-exchange = true
+peer-exchange = false
 metrics-logging = false
 cluster-id = 2
-discv5-discovery = true
+discv5-discovery = false
 discv5-udp-port = 9002
 discv5-enr-auto-update = true
 discv5-bootstrap-node = ["enr:-LG4QBaAbcA921hmu3IrreLqGZ4y3VWCjBCgNN9mpX9vqkkbSrM3HJHZTXnb5iVXgc5pPtDhWLxkB6F3yY25hSwMezkEgmlkgnY0gmlwhH8AAAGKbXVsdGlhZGRyc4oACATAqEQ-BuphgnJzhQACAQAAiXNlY3AyNTZrMaEDpEW1UlUGHRJg6g_zGuCddKWmIUBGZCQX13xGfh9J6KiDdGNwguphg3VkcIIjKYV3YWt1Mg0"]
@@ -21,7 +21,7 @@ shard = [0]
 agent-string = "nwaku-mix"
 nodekey = "ed54db994682e857d77cd6fb81be697382dc43aa5cd78e16b0ec8098549f860e"
 mixkey = "b858ac16bbb551c4b2973313b1c8c8f7ea469fca03f1608d200bbf58d388ec7f"
-rendezvous = true
+rendezvous = false
 listen-address = "127.0.0.1"
 nat = "extip:127.0.0.1"
 ext-multiaddr = ["/ip4/127.0.0.1/tcp/60003"]
diff --git a/simulations/mixnet/config3.toml b/simulations/mixnet/config3.toml
index 41baafacc..80c19b34b 100644
--- a/simulations/mixnet/config3.toml
+++ b/simulations/mixnet/config3.toml
@@ -5,10 +5,10 @@ filter = true
 store = false
 lightpush = true
 max-connections = 150
-peer-exchange = true
+peer-exchange = false
 metrics-logging = false
 cluster-id = 2
-discv5-discovery = true
+discv5-discovery = false
 discv5-udp-port = 9003
 discv5-enr-auto-update = true
 discv5-bootstrap-node = ["enr:-LG4QBaAbcA921hmu3IrreLqGZ4y3VWCjBCgNN9mpX9vqkkbSrM3HJHZTXnb5iVXgc5pPtDhWLxkB6F3yY25hSwMezkEgmlkgnY0gmlwhH8AAAGKbXVsdGlhZGRyc4oACATAqEQ-BuphgnJzhQACAQAAiXNlY3AyNTZrMaEDpEW1UlUGHRJg6g_zGuCddKWmIUBGZCQX13xGfh9J6KiDdGNwguphg3VkcIIjKYV3YWt1Mg0"]
@@ -21,7 +21,7 @@ shard = [0]
 agent-string = "nwaku-mix"
 nodekey = "42f96f29f2d6670938b0864aced65a332dcf5774103b4c44ec4d0ea4ef3c47d6"
 mixkey = "d8bd379bb394b0f22dd236d63af9f1a9bc45266beffc3fbbe19e8b6575f2535b"
-rendezvous = true
+rendezvous = false
 listen-address = "127.0.0.1"
 nat = "extip:127.0.0.1"
 ext-multiaddr = ["/ip4/127.0.0.1/tcp/60004"]
diff --git a/simulations/mixnet/config4.toml b/simulations/mixnet/config4.toml
index 549939917..ed5b2dad0 100644
--- a/simulations/mixnet/config4.toml
+++ b/simulations/mixnet/config4.toml
@@ -5,10 +5,10 @@ filter = true
 store = false
 lightpush = true
 max-connections = 150
-peer-exchange = true
+peer-exchange = false
 metrics-logging = false
 cluster-id = 2
-discv5-discovery = true
+discv5-discovery = false
 discv5-udp-port = 9004
 discv5-enr-auto-update = true
 discv5-bootstrap-node = ["enr:-LG4QBaAbcA921hmu3IrreLqGZ4y3VWCjBCgNN9mpX9vqkkbSrM3HJHZTXnb5iVXgc5pPtDhWLxkB6F3yY25hSwMezkEgmlkgnY0gmlwhH8AAAGKbXVsdGlhZGRyc4oACATAqEQ-BuphgnJzhQACAQAAiXNlY3AyNTZrMaEDpEW1UlUGHRJg6g_zGuCddKWmIUBGZCQX13xGfh9J6KiDdGNwguphg3VkcIIjKYV3YWt1Mg0"]
@@ -21,7 +21,7 @@ shard = [0]
 agent-string = "nwaku-mix"
 nodekey = "3ce887b3c34b7a92dd2868af33941ed1dbec4893b054572cd5078da09dd923d4"
 mixkey = "780fff09e51e98df574e266bf3266ec6a3a1ddfcf7da826a349a29c137009d49"
-rendezvous = true
+rendezvous = false
 listen-address = "127.0.0.1"
 nat = "extip:127.0.0.1"
 ext-multiaddr = ["/ip4/127.0.0.1/tcp/60005"]
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index 0d2125e35..fba5c6c4e 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit 0d2125e3581b1a5db6af04a9d79a8d150d8949eb
+Subproject commit fba5c6c4e3f9ace302cf785869d5d619abe40c32
diff --git a/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim b/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim
index ee0b3beb8..7bd4d3488 100644
--- a/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim
+++ b/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim
@@ -40,7 +40,10 @@ proc parseBootstrapNode(
     return err("Invalid peer ID in multiaddress: " & multiAddrStr)
 
   # Get the address without the p2p part for connecting
-  ok((peerId, @[multiAddr]))
+  let addrWithoutP2p = multiAddr[0 ..^ 2].valueOr:
+    return err("Failed to strip /p2p/ part from multiaddress: " & multiAddrStr)
+
+  ok((peerId, @[addrWithoutP2p]))
 
 proc build*(
     b: KademliaDiscoveryConfBuilder