diff --git a/tests/v2/test_peer_exchange.nim b/tests/v2/test_peer_exchange.nim
index 904041741..a2f27526f 100644
--- a/tests/v2/test_peer_exchange.nim
+++ b/tests/v2/test_peer_exchange.nim
@@ -26,9 +26,13 @@ procSuite "Peer Exchange":
       node3 = WakuNode.new(nodeKey3, bindIp, Port(60003), sendSignedPeerRecord = true)
     
     var
-      peerExchangeHandler: RoutingRecordsHandler
+      peerExchangeHandler, emptyHandler: RoutingRecordsHandler
       completionFut = newFuture[bool]()
     
+    proc ignorePeerExchange(peer: PeerId, topic: string,
+                            peers: seq[RoutingRecordsPair]) {.gcsafe, raises: [Defect].} =
+      discard
+    
     proc handlePeerExchange(peer: PeerId, topic: string,
                             peers: seq[RoutingRecordsPair]) {.gcsafe, raises: [Defect].} =
       ## Handle peers received via gossipsub peer exchange
@@ -44,9 +48,10 @@ procSuite "Peer Exchange":
         completionFut.complete(true)
 
     peerExchangeHandler = handlePeerExchange
+    emptyHandler = ignorePeerExchange
 
-    node1.mountRelay()
-    node2.mountRelay()
+    node1.mountRelay(peerExchangeHandler = some(emptyHandler))
+    node2.mountRelay(peerExchangeHandler = some(emptyHandler))
     node3.mountRelay(peerExchangeHandler = some(peerExchangeHandler))
 
     # Ensure that node1 prunes all peers after the first connection
diff --git a/tests/v2/test_waku_keepalive.nim b/tests/v2/test_waku_keepalive.nim
index 38c920fbe..c3c3c3834 100644
--- a/tests/v2/test_waku_keepalive.nim
+++ b/tests/v2/test_waku_keepalive.nim
@@ -48,4 +48,5 @@ procSuite "Waku Keepalive":
     check:
       (await completionFut.withTimeout(5.seconds)) == true
 
-    await allFutures([node1.stop(), node2.stop()])
+    await node2.stop()
+    await node1.stop()
diff --git a/vendor/nim-bearssl b/vendor/nim-bearssl
index 65b74302e..0ebb1d7a4 160000
--- a/vendor/nim-bearssl
+++ b/vendor/nim-bearssl
@@ -1 +1 @@
-Subproject commit 65b74302e03912ab5bde64b6da10d05896139007
+Subproject commit 0ebb1d7a4af5f4b4d4756a9b6dbfe5d411fa55d9
diff --git a/vendor/nim-chronos b/vendor/nim-chronos
index bb4c3298f..875d7d8e6 160000
--- a/vendor/nim-chronos
+++ b/vendor/nim-chronos
@@ -1 +1 @@
-Subproject commit bb4c3298f56ba7bc69fbccd08fd6e5474c410262
+Subproject commit 875d7d8e6ef0803ae1c331dbf76b1981b0caeb15
diff --git a/vendor/nim-faststreams b/vendor/nim-faststreams
index 5a5bfd3c0..49e2c52eb 160000
--- a/vendor/nim-faststreams
+++ b/vendor/nim-faststreams
@@ -1 +1 @@
-Subproject commit 5a5bfd3c09887cdf80b052d14bff7b9a0a919938
+Subproject commit 49e2c52eb5dda46b1c9c10d079abe7bffe6cea89
diff --git a/vendor/nim-http-utils b/vendor/nim-http-utils
index 40048e8b3..f83fbce4d 160000
--- a/vendor/nim-http-utils
+++ b/vendor/nim-http-utils
@@ -1 +1 @@
-Subproject commit 40048e8b3e69284bdb5d4daa0a16ad93402c55db
+Subproject commit f83fbce4d6ec7927b75be3f85e4fa905fcb69788
diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization
index 074cd026e..350970651 160000
--- a/vendor/nim-json-serialization
+++ b/vendor/nim-json-serialization
@@ -1 +1 @@
-Subproject commit 074cd026e61675708d518839e6914d55baa4b8ca
+Subproject commit 3509706517f3562cbcbe9d94988eccdd80474ab8
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index 9973b9466..13503f379 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit 9973b9466dd062d7406d0178c750249b7e48471f
+Subproject commit 13503f3799aa7c746e17db0a4af38f8aec4115b8
diff --git a/vendor/nim-unittest2 b/vendor/nim-unittest2
index 24eb5e829..9d23c0beb 160000
--- a/vendor/nim-unittest2
+++ b/vendor/nim-unittest2
@@ -1 +1 @@
-Subproject commit 24eb5e829ed07e71e3a5d09786d5f80aa988874f
+Subproject commit 9d23c0bebe7b3f58cb8a0ab6278d2b277a3d4a48
diff --git a/vendor/nim-websock b/vendor/nim-websock
index 14d852e0d..8927db93f 160000
--- a/vendor/nim-websock
+++ b/vendor/nim-websock
@@ -1 +1 @@
-Subproject commit 14d852e0d40ce71d916545b54ac86c2e35315f62
+Subproject commit 8927db93f6ca96abaacfea39f8ca50ce9d41bcdb
diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim
index 3a7864ea9..e61591d6e 100644
--- a/waku/v2/node/wakunode2.nim
+++ b/waku/v2/node/wakunode2.nim
@@ -705,7 +705,8 @@ proc mountRelay*(node: WakuNode,
   wakuRelay.defaultTopics = concat(@[defaultTopic], topics)
 
   ## Add peer exchange handler
-  if peerExchangeHandler.isSome():    
+  if peerExchangeHandler.isSome():
+    wakuRelay.parameters.enablePX = true # Feature flag for peer exchange in nim-libp2p
     wakuRelay.routingRecordsHandler.add(peerExchangeHandler.get())
 
   node.switch.mount(wakuRelay, protocolMatcher(WakuRelayCodec))