diff --git a/.gitmodules b/.gitmodules
index 2b87c6e..2e6d9eb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "vendor/waku"]
 	path = vendor/waku
-	url = git@github.com:waku-org/nwaku.git
+	url = https://jazzz@github.com/jazzz/nwaku
diff --git a/nim_chat_poc.nimble b/nim_chat_poc.nimble
index a087563..7c10bce 100644
--- a/nim_chat_poc.nimble
+++ b/nim_chat_poc.nimble
@@ -17,13 +17,13 @@ task initialize, "Initialize the project after cloning":
 
 requires "nim >= 2.2.4"
 
-requires "protobuf_serialization >= 0.1.0"
-requires "secp256k1 >= 0.6.0.3.2"
+requires "protobuf_serialization"
+requires "secp256k1"
 requires "blake2"
 requires "chronicles"
-requires "libp2p >= 1.11.0"
+requires "libp2p"
 requires "nimchacha20poly1305" # TODO: remove
-requires "confutils >= 0.1.0"
-requires "eth >= 0.8.0"
-requires "regex >= 0.26.3"
-requires "web3 >= 0.7.0"
+requires "confutils"
+requires "eth"
+requires "regex"
+requires "web3"
diff --git a/src/chat_sdk/delivery/waku_client.nim b/src/chat_sdk/delivery/waku_client.nim
index ad60ed7..16dab9c 100644
--- a/src/chat_sdk/delivery/waku_client.nim
+++ b/src/chat_sdk/delivery/waku_client.nim
@@ -118,7 +118,7 @@ proc buildWakuNode(cfg: WakuConfig): WakuNode =
   builder.withNetworkConfigurationDetails(ip, Port(cfg.port)).tryGet()
   let node = builder.build().tryGet()
 
-  node.mountMetadata(cfg.clusterId).expect("failed to mount waku metadata protocol")
+  node.mountMetadata(cfg.clusterId, @[1'u16, 2'u16]).expect("failed to mount waku metadata protocol")
 
   result = node
 
diff --git a/src/nim_chat_poc.nim b/src/nim_chat_poc.nim
index cde730a..14364c6 100644
--- a/src/nim_chat_poc.nim
+++ b/src/nim_chat_poc.nim
@@ -61,9 +61,6 @@ proc main() {.async.} =
   cfg_saro.staticPeers.add(cfg_raya.getMultiAddr())
   cfg_raya.staticPeers.add(cfg_saro.getMultiAddr())
 
-  info "CFG", cfg = cfg_raya
-  info "CFG", cfg = cfg_saro
-
   # Start Clients
   var saro = newClient("Saro", cfg_saro)
   saro.onNewMessage(proc(convo: Conversation, msg: ContentFrame) {.async.} =
diff --git a/vendor/waku b/vendor/waku
index 3fb21ae..41bdc3c 160000
--- a/vendor/waku
+++ b/vendor/waku
@@ -1 +1 @@
-Subproject commit 3fb21ae079f7c3390844c4f7a6841b5d34cb833a
+Subproject commit 41bdc3ceec946d31c4c05d64bbf384019c389243