diff --git a/vendor/nim-bearssl b/vendor/nim-bearssl
index ba80e2a0d..65b74302e 160000
--- a/vendor/nim-bearssl
+++ b/vendor/nim-bearssl
@@ -1 +1 @@
-Subproject commit ba80e2a0d7ae8aab666cee013e38ff8d33a3e5e7
+Subproject commit 65b74302e03912ab5bde64b6da10d05896139007
diff --git a/vendor/nim-faststreams b/vendor/nim-faststreams
index 37a183153..1a85b3d50 160000
--- a/vendor/nim-faststreams
+++ b/vendor/nim-faststreams
@@ -1 +1 @@
-Subproject commit 37a183153c071539ab870f427c09a1376ba311b9
+Subproject commit 1a85b3d50bf9a6dbbd58df045633dae0907c51c2
diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc
index ad0c3fb6e..b4bab89ab 160000
--- a/vendor/nim-json-rpc
+++ b/vendor/nim-json-rpc
@@ -1 +1 @@
-Subproject commit ad0c3fb6e07bef6a2037637a29ee841d29f9557e
+Subproject commit b4bab89abdde3653939abe36ab9f6cae4aa1cbd1
diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization
index a12beabd2..461fd03ed 160000
--- a/vendor/nim-json-serialization
+++ b/vendor/nim-json-serialization
@@ -1 +1 @@
-Subproject commit a12beabd2fa721407bc99492a0075ce43ad9994d
+Subproject commit 461fd03edb300b7946544b34442d1a05d4ef2270
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index 44a7260f0..eaa72dcdb 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit 44a7260f0754341a6ae9864d4ece5a177cb8fc2b
+Subproject commit eaa72dcdbe26d8236c64711e32cf0c2f8ac65e64
diff --git a/vendor/nim-serialization b/vendor/nim-serialization
index 37bc0db55..9631fbd1c 160000
--- a/vendor/nim-serialization
+++ b/vendor/nim-serialization
@@ -1 +1 @@
-Subproject commit 37bc0db558d85711967acb16e9bb822b06911d46
+Subproject commit 9631fbd1c81c8b25ff8740df440ca7ba87fa6131
diff --git a/vendor/nim-stew b/vendor/nim-stew
index bb705bf17..419903c9a 160000
--- a/vendor/nim-stew
+++ b/vendor/nim-stew
@@ -1 +1 @@
-Subproject commit bb705bf17b46d2c8f9bfb106d9cc7437009a2501
+Subproject commit 419903c9a31ab253cf5cf19f24d9a912dc4b5154
diff --git a/vendor/nim-web3 b/vendor/nim-web3
index 91c998a0d..c3b386b1e 160000
--- a/vendor/nim-web3
+++ b/vendor/nim-web3
@@ -1 +1 @@
-Subproject commit 91c998a0d488cef011e84d8a1ef3d4f83d963111
+Subproject commit c3b386b1e88c0d60bc4ff9da215f969b23ee2f39
diff --git a/vendor/nim-websock b/vendor/nim-websock
index 73edde441..4a7a05884 160000
--- a/vendor/nim-websock
+++ b/vendor/nim-websock
@@ -1 +1 @@
-Subproject commit 73edde4417f7b45003113b7a34212c3ccd95b9fd
+Subproject commit 4a7a058843cdb7a6a4fd25a55f0959c51b0b5847
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index 8425ff9e3..041544c2b 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit 8425ff9e3b6adb83e226d408a5d06d31ac2a7789
+Subproject commit 041544c2b7681040d160f7bd95c0ecc010c06968
diff --git a/waku/common/wakubridge.nim b/waku/common/wakubridge.nim
index e400495ff..955906738 100644
--- a/waku/common/wakubridge.nim
+++ b/waku/common/wakubridge.nim
@@ -104,14 +104,14 @@ proc toV1Topic*(contentTopic: ContentTopic): waku_protocol.Topic {.raises: [Defe
 
 # Message conversion
 
-func toWakuMessage(env: Envelope): WakuMessage =
+func toWakuMessage(env: waku_protocol.Envelope): WakuMessage =
   # Translate a Waku v1 envelope to a Waku v2 message
   WakuMessage(payload: env.data,
               contentTopic: toV2ContentTopic(env.topic),
               timestamp: (getNanosecondTime(env.expiry) - getNanosecondTime(env.ttl)),
               version: 1)
 
-proc toWakuV2(bridge: WakuBridge, env: Envelope) {.async.} =
+proc toWakuV2(bridge: WakuBridge, env: waku_protocol.Envelope) {.async.} =
   let msg = env.toWakuMessage()
 
   if bridge.seen.containsOrAdd(msg.encode().buffer.hash()):
@@ -224,7 +224,7 @@ proc start*(bridge: WakuBridge) {.async.} =
 
   # Bridging
   # Handle messages on Waku v1 and bridge to Waku v2  
-  proc handleEnvReceived(envelope: Envelope) {.gcsafe, raises: [Defect].} =
+  proc handleEnvReceived(envelope: waku_protocol.Envelope) {.gcsafe, raises: [Defect].} =
     trace "Bridging envelope from V1 to V2", envelope=envelope
     asyncSpawn bridge.toWakuV2(envelope)
 
diff --git a/waku/v2/node/jsonrpc/admin_api.nim b/waku/v2/node/jsonrpc/admin_api.nim
index fb6e4a2b0..96f9487df 100644
--- a/waku/v2/node/jsonrpc/admin_api.nim
+++ b/waku/v2/node/jsonrpc/admin_api.nim
@@ -1,4 +1,4 @@
-{.push raises: [Defect, CatchableError].}
+{.push raises: [Defect].}
 
 import
   std/[options, sequtils, sets],
diff --git a/waku/v2/node/jsonrpc/debug_api.nim b/waku/v2/node/jsonrpc/debug_api.nim
index c6c8986c5..0b3810d4c 100644
--- a/waku/v2/node/jsonrpc/debug_api.nim
+++ b/waku/v2/node/jsonrpc/debug_api.nim
@@ -1,4 +1,4 @@
-{.push raises: [Defect, CatchableError].}
+{.push raises: [Defect].}
 
 import
   chronicles,
diff --git a/waku/v2/node/jsonrpc/filter_api.nim b/waku/v2/node/jsonrpc/filter_api.nim
index 6c5b593ba..9d0ba174c 100644
--- a/waku/v2/node/jsonrpc/filter_api.nim
+++ b/waku/v2/node/jsonrpc/filter_api.nim
@@ -1,4 +1,4 @@
-{.push raises: [Defect, CatchableError].}
+{.push raises: [Defect].}
 
 import
   std/[tables,sequtils],
diff --git a/waku/v2/node/jsonrpc/private_api.nim b/waku/v2/node/jsonrpc/private_api.nim
index c70bc36cc..eec46c38e 100644
--- a/waku/v2/node/jsonrpc/private_api.nim
+++ b/waku/v2/node/jsonrpc/private_api.nim
@@ -1,4 +1,4 @@
-{.push raises: [Defect, CatchableError].}
+{.push raises: [Defect].}
 
 import
   std/[tables,sequtils],
diff --git a/waku/v2/node/jsonrpc/relay_api.nim b/waku/v2/node/jsonrpc/relay_api.nim
index f7253bd12..b75b7021b 100644
--- a/waku/v2/node/jsonrpc/relay_api.nim
+++ b/waku/v2/node/jsonrpc/relay_api.nim
@@ -1,4 +1,4 @@
-{.push raises: [Defect, CatchableError].}
+{.push raises: [Defect].}
 
 import
   std/[tables,sequtils],
diff --git a/waku/v2/node/jsonrpc/store_api.nim b/waku/v2/node/jsonrpc/store_api.nim
index 5b3e99abb..95b7168c3 100644
--- a/waku/v2/node/jsonrpc/store_api.nim
+++ b/waku/v2/node/jsonrpc/store_api.nim
@@ -1,4 +1,4 @@
-{.push raises: [Defect, CatchableError].}
+{.push raises: [Defect].}
 
 import
   std/options,