diff --git a/nimble.lock b/nimble.lock
index fe702cc65..b29c76eba 100644
--- a/nimble.lock
+++ b/nimble.lock
@@ -454,9 +454,9 @@
       }
     },
     "json_rpc": {
-      "version": "0.6.1",
-      "vcsRevision": "8ce09c2ccc08b23f433a054b2b1ccb022d9547dc",
-      "url": "https://github.com/fcecin/nim-json-rpc-websock040",
+      "version": "0.6.0",
+      "vcsRevision": "f62ed04d7c630ddd834e296b7e7db2e1aa72a315",
+      "url": "https://github.com/status-im/nim-json-rpc.git",
       "downloadMethod": "git",
       "dependencies": [
         "nim",
@@ -472,7 +472,7 @@
         "unittest2"
       ],
       "checksums": {
-        "sha1": "596db0aafcb3c83f5dba6d42993f2276e0d00eb5"
+        "sha1": "4221c98dbc09ba56d68ca0a36b5c2ad90e39a43b"
       }
     },
     "lsquic": {
@@ -538,8 +538,8 @@
     },
     "web3": {
       "version": "0.8.0",
-      "vcsRevision": "96f39ea1b633277c1d93eafd62759db1d498e359",
-      "url": "https://github.com/fcecin/nim-web3-websock040",
+      "vcsRevision": "cdfe5601d2812a58e54faf53ee634452d01e5918",
+      "url": "https://github.com/status-im/nim-web3",
       "downloadMethod": "git",
       "dependencies": [
         "nim",
@@ -557,7 +557,7 @@
         "results"
       ],
       "checksums": {
-        "sha1": "b5972104bc9223a34ae3758293225264822af893"
+        "sha1": "26a112af032ef1536f97da2ca7364af618a11b80"
       }
     },
     "dnsdisc": {
diff --git a/waku.nimble b/waku.nimble
index 949c07979..552d38a9b 100644
--- a/waku.nimble
+++ b/waku.nimble
@@ -39,13 +39,11 @@ requires "nim >= 2.2.4",
   "secp256k1",
   "bearssl",
   # RPC & APIs
-  # DRAFT: json_rpc + web3 repointed to fcecin forks for the libp2p 2.0.0 bump.
-  # json_rpc fork relaxes the websock cap (<0.4.0 -> <0.5.0); web3 fork repoints
-  # its own json_rpc require to the same fork so the SAT graph unifies. Revert to
-  # status-im json_rpc + bare "web3" once the cap fix lands upstream.
-  "https://github.com/fcecin/nim-json-rpc-websock040#8ce09c2ccc08b23f433a054b2b1ccb022d9547dc",
+  # json_rpc pinned to the master commit that relaxes the nim-websock cap to allow
+  # v0.4.0 (PR #277, landed after the v0.6.0 tag) — needed by the libp2p 2.0.0 bump.
+  "https://github.com/status-im/nim-json-rpc.git#f62ed04d7c630ddd834e296b7e7db2e1aa72a315",
   "presto",
-  "https://github.com/fcecin/nim-web3-websock040#96f39ea1b633277c1d93eafd62759db1d498e359",
+  "web3",
   # Database
   "db_connector",
   "sqlite3_abi",