diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index aa8ce46f7..cd60b254a 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit aa8ce46f782240cb99a7222c474022b8cfd24e52
+Subproject commit cd60b254a0700b0daac7a6cb2c0c48860b57c539
diff --git a/waku/node/waku_switch.nim b/waku/node/waku_switch.nim
index d1af77662..60ffa0755 100644
--- a/waku/node/waku_switch.nim
+++ b/waku/node/waku_switch.nim
@@ -47,10 +47,14 @@ proc withWssTransport*(
 ): SwitchBuilder {.raises: [Defect, IOError].} =
   let key: TLSPrivateKey = getSecureKey(secureKeyPath)
   let cert: TLSCertificate = getSecureCert(secureCertPath)
-  b.withWsTransport(
-    tlsPrivateKey = key,
-    tlsCertificate = cert,
-    {TLSFlags.NoVerifyHost, TLSFlags.NoVerifyServerName}, # THIS IS INSECURE, NO?
+  b.withTransport(
+    proc(upgr: Upgrade, privateKey: crypto.PrivateKey): Transport =
+      WsTransport.new(
+        upgr,
+        tlsPrivateKey = key,
+        tlsCertificate = cert,
+        {TLSFlags.NoVerifyHost, TLSFlags.NoVerifyServerName},
+      )
   )
 
 proc newWakuSwitch*(