diff --git a/Makefile b/Makefile
index cabeec80f..99fa24208 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,11 @@ ifneq (,$(findstring MINGW,$(detected_OS)))
   detected_OS := Windows
 endif
 
+# Ensure the nim/nimble installed by install-nim/install-nimble are found first
+export PATH := $(HOME)/.nimble/bin:$(PATH)
+
 # NIM binary location
-NIM_BINARY := $(shell which nim)
+NIM_BINARY := $(shell which nim 2>/dev/null)
 NPH := $(HOME)/.nimble/bin/nph
 NIMBLEDEPS_STAMP := nimbledeps/.nimble-setup
 
@@ -39,7 +42,7 @@ endif
 ##########
 ## Main ##
 ##########
-.PHONY: all test update clean examples deps nimble
+.PHONY: all test update clean examples deps nimble install-nim install-nimble
 
 # default target
 all: | wakunode2 libwaku liblogosdelivery
@@ -67,7 +70,7 @@ waku.nims:
 	ln -s waku.nimble $@
 
 $(NIMBLEDEPS_STAMP): nimble.lock | waku.nims
-	@if ! command -v nimble > /dev/null 2>&1; then $(MAKE) install-nimble; fi
+	$(MAKE) install-nimble
 	nimble setup --localdeps
 	$(MAKE) build-nph
 	$(MAKE) rebuild-bearssl-nimbledeps
@@ -86,54 +89,24 @@ clean:
 	rm nimble.paths 2> /dev/null || true
 	nimble clean
 
-REQUIRED_NIM_VERSION    := $(shell grep -E '^const NimVersion\s*=' waku.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"')
-REQUIRED_NIMBLE_VERSION := $(shell grep -E '^const NimbleVersion\s*=' waku.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"')
+REQUIRED_NIM_VERSION    := $(shell grep -E '^const RequiredNimVersion\s*=' waku.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"')
+REQUIRED_NIMBLE_VERSION := $(shell grep -E '^const RequiredNimbleVersion\s*=' waku.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"')
 
 install-nim:
-	$(eval NIM_OS          := $(shell uname -s | tr 'A-Z' 'a-z' | sed 's/darwin/macosx/'))
-	$(eval NIM_ARCH        := $(shell uname -m | sed 's/x86_64/x64/;s/aarch64/arm64/'))
-	$(eval NIM_INSTALL_DIR := $(HOME)/.nim_runtime)
-	@nim_ver=$$(nim --version 2>/dev/null | head -1 | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1); \
-	if [ "$$nim_ver" = "$(REQUIRED_NIM_VERSION)" ]; then \
-	  echo "nim $(REQUIRED_NIM_VERSION) already installed, skipping."; \
-	else \
-	  curl -L "https://github.com/nim-lang/Nim/releases/download/v$(REQUIRED_NIM_VERSION)/nim-$(REQUIRED_NIM_VERSION)-$(NIM_OS)_$(NIM_ARCH).tar.xz" \
-	    -o /tmp/nim-$(REQUIRED_NIM_VERSION).tar.xz && \
-	  tar -xJf /tmp/nim-$(REQUIRED_NIM_VERSION).tar.xz -C /tmp && \
-	  mkdir -p $(NIM_INSTALL_DIR) && \
-	  cd /tmp/nim-$(REQUIRED_NIM_VERSION) && ./install.sh $(NIM_INSTALL_DIR); \
-	fi
+	scripts/install_nim.sh $(REQUIRED_NIM_VERSION)
 
 install-nimble: install-nim
 	@nimble_ver=$$(nimble --version 2>/dev/null | head -1 | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1); \
 	if [ "$$nimble_ver" = "$(REQUIRED_NIMBLE_VERSION)" ]; then \
 	  echo "nimble $(REQUIRED_NIMBLE_VERSION) already installed, skipping."; \
 	else \
-	  cd /tmp && PATH="$(HOME)/.nim_runtime/bin:$$PATH" \
-	    nimble install "nimble@$(REQUIRED_NIMBLE_VERSION)" -y; \
+	  nimble install "nimble@$(REQUIRED_NIMBLE_VERSION)" -y; \
 	fi
 
 build:
-	@nim_ver=$$(nim --version 2>/dev/null | head -1 | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1); \
-	if [ "$$nim_ver" != "$(REQUIRED_NIM_VERSION)" ]; then \
-		echo "Error: Nim $(REQUIRED_NIM_VERSION) is required, but found '$$nim_ver'"; \
-		exit 1; \
-	fi
-	@nimble_ver=$$(nimble --version 2>/dev/null | head -1 | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1); \
-	if [ "$$nimble_ver" != "$(REQUIRED_NIMBLE_VERSION)" ]; then \
-		echo "Error: Nimble $(REQUIRED_NIMBLE_VERSION) is required, but found '$$nimble_ver'"; \
-		exit 1; \
-	fi
 	mkdir -p build
 
-nimble:
-	echo "Inside nimble target, checking for nimble..." && \
-	command -v nimble >/dev/null 2>&1 || { \
-		mv nimbledeps nimbledeps_backup 2>/dev/null || true; \
-		echo "choosenim not found, installing ..."; \
-		curl -sSf https://nim-lang.org/choosenim/init.sh | sh; \
-		mv nimbledeps_backup nimbledeps 2>/dev/null || true; \
-	}
+nimble: install-nimble
 
 ## Possible values: prod; debug
 TARGET ?= prod
@@ -230,7 +203,7 @@ clean: | clean-librln
 #################
 .PHONY: testcommon
 
-testcommon: | build
+testcommon: | $(NIMBLEDEPS_STAMP) build
 	echo -e $(BUILD_MSG) "build/$@" && \
 		nimble testcommon
 
@@ -239,7 +212,7 @@ testcommon: | build
 ##########
 .PHONY: testwaku wakunode2 testwakunode2 example2 chat2 chat2bridge liteprotocoltester
 
-testwaku: | build rln-deps librln
+testwaku: | $(NIMBLEDEPS_STAMP) build rln-deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
 		nimble test
 
diff --git a/nimble.lock b/nimble.lock
index 96f64baf3..978ea926f 100644
--- a/nimble.lock
+++ b/nimble.lock
@@ -1,103 +1,66 @@
 {
   "version": 2,
   "packages": {
+    "nim": {
+      "version": "2.2.4",
+      "vcsRevision": "911e0dbb1f76de61fa0215ab1bb85af5334cc9a8",
+      "url": "https://github.com/nim-lang/Nim.git",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "68bb85cbfb1832ce4db43943911b046c3af3caab"
+      }
+    },
     "unittest2": {
       "version": "0.2.5",
       "vcsRevision": "26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189",
       "url": "https://github.com/status-im/nim-unittest2",
       "downloadMethod": "git",
-      "dependencies": [],
+      "dependencies": [
+        "nim"
+      ],
       "checksums": {
         "sha1": "02bb3751ba9ddc3c17bfd89f2e41cb6bfb8fc0c9"
       }
     },
     "bearssl": {
-      "version": "0.2.7",
-      "vcsRevision": "3b341f30d8c619b9a75c154243f9a55468a404e2",
+      "version": "0.2.8",
+      "vcsRevision": "22c6a76ce015bc07e011562bdcfc51d9446c1e82",
       "url": "https://github.com/status-im/nim-bearssl",
       "downloadMethod": "git",
       "dependencies": [
+        "nim",
         "unittest2"
       ],
       "checksums": {
-        "sha1": "a85aab15b1b9a8b2438e9a128ac2eba41227da79"
+        "sha1": "da4dd7ae96d536bdaf42dca9c85d7aed024b6a86"
       }
     },
     "bearssl_pkey_decoder": {
-      "version": "0.1.0",
+      "version": "#21dd3710df9345ed2ad8bf8f882761e07863b8e0",
       "vcsRevision": "21dd3710df9345ed2ad8bf8f882761e07863b8e0",
       "url": "https://github.com/vacp2p/bearssl_pkey_decoder",
       "downloadMethod": "git",
       "dependencies": [
+        "nim",
         "bearssl"
       ],
       "checksums": {
         "sha1": "21b42e2e6ddca6c875d3fc50f36a5115abf51714"
       }
     },
-    "results": {
-      "version": "0.5.1",
-      "vcsRevision": "df8113dda4c2d74d460a8fa98252b0b771bf1f27",
-      "url": "https://github.com/arnetheduck/nim-results",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "a9c011f74bc9ed5c91103917b9f382b12e82a9e7"
-      }
-    },
-    "stew": {
-      "version": "0.5.0",
-      "vcsRevision": "4382b18f04b3c43c8409bfcd6b62063773b2bbaa",
-      "url": "https://github.com/status-im/nim-stew",
+    "jwt": {
+      "version": "#18f8378de52b241f321c1f9ea905456e89b95c6f",
+      "vcsRevision": "18f8378de52b241f321c1f9ea905456e89b95c6f",
+      "url": "https://github.com/vacp2p/nim-jwt.git",
       "downloadMethod": "git",
       "dependencies": [
-        "results",
-        "unittest2"
+        "nim",
+        "bearssl",
+        "bearssl_pkey_decoder"
       ],
       "checksums": {
-        "sha1": "db22942939773ab7d5a0f2b2668c237240c67dd6"
-      }
-    },
-    "faststreams": {
-      "version": "0.5.0",
-      "vcsRevision": "ce27581a3e881f782f482cb66dc5b07a02bd615e",
-      "url": "https://github.com/status-im/nim-faststreams",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "ee61e507b805ae1df7ec936f03f2d101b0d72383"
-      }
-    },
-    "serialization": {
-      "version": "0.5.2",
-      "vcsRevision": "b0f2fa32960ea532a184394b0f27be37bd80248b",
-      "url": "https://github.com/status-im/nim-serialization",
-      "downloadMethod": "git",
-      "dependencies": [
-        "faststreams",
-        "unittest2",
-        "stew"
-      ],
-      "checksums": {
-        "sha1": "fa35c1bb76a0a02a2379fe86eaae0957c7527cb8"
-      }
-    },
-    "json_serialization": {
-      "version": "0.4.4",
-      "vcsRevision": "c343b0e243d9e17e2c40f3a8a24340f7c4a71d44",
-      "url": "https://github.com/status-im/nim-json-serialization",
-      "downloadMethod": "git",
-      "dependencies": [
-        "faststreams",
-        "serialization",
-        "stew",
-        "results"
-      ],
-      "checksums": {
-        "sha1": "8b3115354104858a0ac9019356fb29720529c2bd"
+        "sha1": "bcfd6fc9c5e10a52b87117219b7ab5c98136bc8e"
       }
     },
     "testutils": {
@@ -106,25 +69,76 @@
       "url": "https://github.com/status-im/nim-testutils",
       "downloadMethod": "git",
       "dependencies": [
+        "nim",
         "unittest2"
       ],
       "checksums": {
         "sha1": "96a11cf8b84fa9bd12d4a553afa1cc4b7f9df4e3"
       }
     },
-    "chronicles": {
-      "version": "0.12.2",
-      "vcsRevision": "27ec507429a4eb81edc20f28292ee8ec420be05b",
-      "url": "https://github.com/status-im/nim-chronicles",
+    "db_connector": {
+      "version": "0.1.0",
+      "vcsRevision": "29450a2063970712422e1ab857695c12d80112a6",
+      "url": "https://github.com/nim-lang/db_connector",
       "downloadMethod": "git",
       "dependencies": [
-        "faststreams",
-        "serialization",
-        "json_serialization",
-        "testutils"
+        "nim"
       ],
       "checksums": {
-        "sha1": "02febb20d088120b2836d3306cfa21f434f88f65"
+        "sha1": "4f2e67d0e4b61af9ac5575509305660b473f01a4"
+      }
+    },
+    "results": {
+      "version": "0.5.1",
+      "vcsRevision": "df8113dda4c2d74d460a8fa98252b0b771bf1f27",
+      "url": "https://github.com/arnetheduck/nim-results",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim"
+      ],
+      "checksums": {
+        "sha1": "a9c011f74bc9ed5c91103917b9f382b12e82a9e7"
+      }
+    },
+    "nat_traversal": {
+      "version": "0.0.1",
+      "vcsRevision": "860e18c37667b5dd005b94c63264560c35d88004",
+      "url": "https://github.com/status-im/nim-nat-traversal",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "1a376d3e710590ef2c48748a546369755f0a7c97"
+      }
+    },
+    "stew": {
+      "version": "0.5.0",
+      "vcsRevision": "4382b18f04b3c43c8409bfcd6b62063773b2bbaa",
+      "url": "https://github.com/status-im/nim-stew",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "db22942939773ab7d5a0f2b2668c237240c67dd6"
+      }
+    },
+    "zlib": {
+      "version": "0.1.0",
+      "vcsRevision": "e680f269fb01af2c34a2ba879ff281795a5258fe",
+      "url": "https://github.com/status-im/nim-zlib",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "stew",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "bbde4f5a97a84b450fef7d107461e5f35cf2b47f"
       }
     },
     "httputils": {
@@ -133,6 +147,7 @@
       "url": "https://github.com/status-im/nim-http-utils",
       "downloadMethod": "git",
       "dependencies": [
+        "nim",
         "stew",
         "results",
         "unittest2"
@@ -147,6 +162,7 @@
       "url": "https://github.com/status-im/nim-chronos",
       "downloadMethod": "git",
       "dependencies": [
+        "nim",
         "results",
         "stew",
         "bearssl",
@@ -157,95 +173,13 @@
         "sha1": "3a4c9477df8cef20a04e4f1b54a2d74fdfc2a3d0"
       }
     },
-    "confutils": {
-      "version": "0.1.0",
-      "vcsRevision": "7728f6bd81a1eedcfe277d02ea85fdb805bcc05a",
-      "url": "https://github.com/status-im/nim-confutils",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew",
-        "serialization",
-        "results"
-      ],
-      "checksums": {
-        "sha1": "8bc8c30b107fdba73b677e5f257c6c42ae1cdc8e"
-      }
-    },
-    "db_connector": {
-      "version": "0.1.0",
-      "vcsRevision": "29450a2063970712422e1ab857695c12d80112a6",
-      "url": "https://github.com/nim-lang/db_connector",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "4f2e67d0e4b61af9ac5575509305660b473f01a4"
-      }
-    },
-    "dnsclient": {
-      "version": "0.3.4",
-      "vcsRevision": "23214235d4784d24aceed99bbfe153379ea557c8",
-      "url": "https://github.com/ba0f3/dnsclient.nim",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "65262c7e533ff49d6aca5539da4bc6c6ce132f40"
-      }
-    },
-    "nimcrypto": {
-      "version": "0.6.4",
-      "vcsRevision": "721fb99ee099b632eb86dfad1f0d96ee87583774",
-      "url": "https://github.com/cheatfate/nimcrypto",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "f9ab24fa940ed03d0fb09729a7303feb50b7eaec"
-      }
-    },
-    "stint": {
-      "version": "0.8.2",
-      "vcsRevision": "470b7892561b5179ab20bd389a69217d6213fe58",
-      "url": "https://github.com/status-im/nim-stint",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "d8f871fd617e7857192d4609fe003b48942a8ae5"
-      }
-    },
-    "secp256k1": {
-      "version": "0.6.0.3.2",
-      "vcsRevision": "d8f1288b7c72f00be5fc2c5ea72bf5cae1eafb15",
-      "url": "https://github.com/status-im/nim-secp256k1",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew",
-        "results",
-        "nimcrypto"
-      ],
-      "checksums": {
-        "sha1": "6618ef9de17121846a8c1d0317026b0ce8584e10"
-      }
-    },
-    "nat_traversal": {
-      "version": "0.0.1",
-      "vcsRevision": "860e18c37667b5dd005b94c63264560c35d88004",
-      "url": "https://github.com/status-im/nim-nat-traversal",
-      "downloadMethod": "git",
-      "dependencies": [
-        "results"
-      ],
-      "checksums": {
-        "sha1": "1a376d3e710590ef2c48748a546369755f0a7c97"
-      }
-    },
     "metrics": {
       "version": "0.2.1",
       "vcsRevision": "a1296caf3ebb5f30f51a5feae7749a30df2824c2",
       "url": "https://github.com/status-im/nim-metrics",
       "downloadMethod": "git",
       "dependencies": [
+        "nim",
         "chronos",
         "results",
         "stew"
@@ -254,27 +188,18 @@
         "sha1": "84bb09873d7677c06046f391c7b473cd2fcff8a2"
       }
     },
-    "sqlite3_abi": {
-      "version": "3.52.0.0",
-      "vcsRevision": "4b79c5e1882b7fc6c00aec311daf1ed50ad653d5",
-      "url": "https://github.com/arnetheduck/nim-sqlite3-abi",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "b56b489a7cb01eef8821d66d38d411923a14316d"
-      }
-    },
-    "minilru": {
-      "version": "0.1.0",
-      "vcsRevision": "6dd93feb60f4cded3c05e7af7209cf63fb677893",
-      "url": "https://github.com/status-im/nim-minilru",
+    "faststreams": {
+      "version": "0.5.0",
+      "vcsRevision": "ce27581a3e881f782f482cb66dc5b07a02bd615e",
+      "url": "https://github.com/status-im/nim-faststreams",
       "downloadMethod": "git",
       "dependencies": [
-        "results",
+        "nim",
+        "stew",
         "unittest2"
       ],
       "checksums": {
-        "sha1": "0be03a5da29fdd4409ea74a60fd0ccce882601b4"
+        "sha1": "ee61e507b805ae1df7ec936f03f2d101b0d72383"
       }
     },
     "snappy": {
@@ -283,6 +208,7 @@
       "url": "https://github.com/status-im/nim-snappy",
       "downloadMethod": "git",
       "dependencies": [
+        "nim",
         "faststreams",
         "unittest2",
         "results",
@@ -292,12 +218,271 @@
         "sha1": "e572d60d6a3178c5b1cde2400c51ad771812cd3d"
       }
     },
+    "serialization": {
+      "version": "0.5.2",
+      "vcsRevision": "b0f2fa32960ea532a184394b0f27be37bd80248b",
+      "url": "https://github.com/status-im/nim-serialization",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "faststreams",
+        "unittest2",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "fa35c1bb76a0a02a2379fe86eaae0957c7527cb8"
+      }
+    },
+    "toml_serialization": {
+      "version": "0.2.18",
+      "vcsRevision": "b5b387e6fb2a7cc75d54a269b07cc6218361bd46",
+      "url": "https://github.com/status-im/nim-toml-serialization",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "faststreams",
+        "serialization",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "76ae1c2af5dd092849b41750ff29217980dc9ca3"
+      }
+    },
+    "confutils": {
+      "version": "0.1.0",
+      "vcsRevision": "7728f6bd81a1eedcfe277d02ea85fdb805bcc05a",
+      "url": "https://github.com/status-im/nim-confutils",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "stew",
+        "serialization",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "8bc8c30b107fdba73b677e5f257c6c42ae1cdc8e"
+      }
+    },
+    "json_serialization": {
+      "version": "0.4.4",
+      "vcsRevision": "c343b0e243d9e17e2c40f3a8a24340f7c4a71d44",
+      "url": "https://github.com/status-im/nim-json-serialization",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "faststreams",
+        "serialization",
+        "stew",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "8b3115354104858a0ac9019356fb29720529c2bd"
+      }
+    },
+    "chronicles": {
+      "version": "0.12.2",
+      "vcsRevision": "27ec507429a4eb81edc20f28292ee8ec420be05b",
+      "url": "https://github.com/status-im/nim-chronicles",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "faststreams",
+        "serialization",
+        "json_serialization",
+        "testutils"
+      ],
+      "checksums": {
+        "sha1": "02febb20d088120b2836d3306cfa21f434f88f65"
+      }
+    },
+    "presto": {
+      "version": "0.1.1",
+      "vcsRevision": "d66043dd7ede146442e6c39720c76a20bde5225f",
+      "url": "https://github.com/status-im/nim-presto",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "chronos",
+        "chronicles",
+        "metrics",
+        "results",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "8df97c45683abe2337bdff43b844c4fbcc124ca2"
+      }
+    },
+    "stint": {
+      "version": "0.8.2",
+      "vcsRevision": "470b7892561b5179ab20bd389a69217d6213fe58",
+      "url": "https://github.com/status-im/nim-stint",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "stew",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "d8f871fd617e7857192d4609fe003b48942a8ae5"
+      }
+    },
+    "minilru": {
+      "version": "0.1.0",
+      "vcsRevision": "6dd93feb60f4cded3c05e7af7209cf63fb677893",
+      "url": "https://github.com/status-im/nim-minilru",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "0be03a5da29fdd4409ea74a60fd0ccce882601b4"
+      }
+    },
+    "sqlite3_abi": {
+      "version": "3.53.0.0",
+      "vcsRevision": "8240e8e2819dfce1b67fa2733135d01b5cc80ae0",
+      "url": "https://github.com/arnetheduck/nim-sqlite3-abi",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim"
+      ],
+      "checksums": {
+        "sha1": "fb7a6e6f36fc4eb4dfa6634dbcbf5cd0dfd0ebf0"
+      }
+    },
+    "dnsclient": {
+      "version": "0.3.4",
+      "vcsRevision": "23214235d4784d24aceed99bbfe153379ea557c8",
+      "url": "https://github.com/ba0f3/dnsclient.nim",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim"
+      ],
+      "checksums": {
+        "sha1": "65262c7e533ff49d6aca5539da4bc6c6ce132f40"
+      }
+    },
+    "unicodedb": {
+      "version": "0.13.2",
+      "vcsRevision": "66f2458710dc641dd4640368f9483c8a0ec70561",
+      "url": "https://github.com/nitely/nim-unicodedb",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim"
+      ],
+      "checksums": {
+        "sha1": "739102d885d99bb4571b1955f5f12aee423c935b"
+      }
+    },
+    "regex": {
+      "version": "0.26.3",
+      "vcsRevision": "4593305ed1e49731fc75af1dc572dd2559aad19c",
+      "url": "https://github.com/nitely/nim-regex",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "unicodedb"
+      ],
+      "checksums": {
+        "sha1": "4d24e7d7441137cd202e16f2359a5807ddbdc31f"
+      }
+    },
+    "nimcrypto": {
+      "version": "0.6.4",
+      "vcsRevision": "721fb99ee099b632eb86dfad1f0d96ee87583774",
+      "url": "https://github.com/cheatfate/nimcrypto",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim"
+      ],
+      "checksums": {
+        "sha1": "f9ab24fa940ed03d0fb09729a7303feb50b7eaec"
+      }
+    },
+    "websock": {
+      "version": "0.3.0",
+      "vcsRevision": "c105d98e6522e0e2cbe3dfa11b07a273e9fd0e7b",
+      "url": "https://github.com/status-im/nim-websock",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "chronos",
+        "httputils",
+        "chronicles",
+        "stew",
+        "nimcrypto",
+        "bearssl",
+        "results",
+        "zlib"
+      ],
+      "checksums": {
+        "sha1": "1294a66520fa4541e261dec8a6a84f774fb8c0ac"
+      }
+    },
+    "json_rpc": {
+      "version": "#43bbf499143eb45046c83ac9794c9e3280a2b8e7",
+      "vcsRevision": "43bbf499143eb45046c83ac9794c9e3280a2b8e7",
+      "url": "https://github.com/status-im/nim-json-rpc.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "stew",
+        "nimcrypto",
+        "stint",
+        "chronos",
+        "httputils",
+        "chronicles",
+        "websock",
+        "serialization",
+        "json_serialization",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "30ff6ead115b88c79862c5c7e37b1c9852eea59f"
+      }
+    },
+    "lsquic": {
+      "version": "#4fb03ee7bfb39aecb3316889fdcb60bec3d0936f",
+      "vcsRevision": "4fb03ee7bfb39aecb3316889fdcb60bec3d0936f",
+      "url": "https://github.com/vacp2p/nim-lsquic",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "zlib",
+        "stew",
+        "chronos",
+        "nimcrypto",
+        "unittest2",
+        "chronicles"
+      ],
+      "checksums": {
+        "sha1": "f465fa994346490d0924d162f53d9b5aec62f948"
+      }
+    },
+    "secp256k1": {
+      "version": "0.6.0.3.2",
+      "vcsRevision": "d8f1288b7c72f00be5fc2c5ea72bf5cae1eafb15",
+      "url": "https://github.com/status-im/nim-secp256k1",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "stew",
+        "results",
+        "nimcrypto"
+      ],
+      "checksums": {
+        "sha1": "6618ef9de17121846a8c1d0317026b0ce8584e10"
+      }
+    },
     "eth": {
       "version": "0.9.0",
       "vcsRevision": "d9135e6c3c5d6d819afdfb566aa8d958756b73a8",
       "url": "https://github.com/status-im/nim-eth",
       "downloadMethod": "git",
       "dependencies": [
+        "nim",
         "nimcrypto",
         "stint",
         "secp256k1",
@@ -318,12 +503,37 @@
         "sha1": "2e01b0cfff9523d110562af70d19948280f8013e"
       }
     },
+    "web3": {
+      "version": "0.8.0",
+      "vcsRevision": "cdfe5601d2812a58e54faf53ee634452d01e5918",
+      "url": "https://github.com/status-im/nim-web3",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "chronicles",
+        "chronos",
+        "bearssl",
+        "eth",
+        "faststreams",
+        "json_rpc",
+        "serialization",
+        "json_serialization",
+        "nimcrypto",
+        "stew",
+        "stint",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "26a112af032ef1536f97da2ca7364af618a11b80"
+      }
+    },
     "dnsdisc": {
       "version": "0.1.0",
       "vcsRevision": "38f2e0f52c0a8f032ef4530835e519d550706d9e",
       "url": "https://github.com/status-im/nim-dnsdisc",
       "downloadMethod": "git",
       "dependencies": [
+        "nim",
         "bearssl",
         "chronicles",
         "chronos",
@@ -339,119 +549,13 @@
         "sha1": "055b882a0f6b1d1e57a25a7af99d2e5ac6268154"
       }
     },
-    "taskpools": {
-      "version": "0.1.0",
-      "vcsRevision": "9e8ccc754631ac55ac2fd495e167e74e86293edb",
-      "url": "https://github.com/status-im/nim-taskpools",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "09e1b2fdad55b973724d61227971afc0df0b7a81"
-      }
-    },
-    "ffi": {
-      "version": "0.1.3",
-      "vcsRevision": "06111de155253b34e47ed2aaed1d61d08d62cc1b",
-      "url": "https://github.com/logos-messaging/nim-ffi",
-      "downloadMethod": "git",
-      "dependencies": [
-        "chronos",
-        "chronicles",
-        "taskpools"
-      ],
-      "checksums": {
-        "sha1": "6f9d49375ea1dc71add55c72ac80a808f238e5b0"
-      }
-    },
-    "zlib": {
-      "version": "0.1.0",
-      "vcsRevision": "e680f269fb01af2c34a2ba879ff281795a5258fe",
-      "url": "https://github.com/status-im/nim-zlib",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew",
-        "results"
-      ],
-      "checksums": {
-        "sha1": "bbde4f5a97a84b450fef7d107461e5f35cf2b47f"
-      }
-    },
-    "websock": {
-      "version": "0.2.2",
-      "vcsRevision": "3918ce3900c83e1cc7496232a307709f195f7acd",
-      "url": "https://github.com/status-im/nim-websock",
-      "downloadMethod": "git",
-      "dependencies": [
-        "chronos",
-        "httputils",
-        "chronicles",
-        "stew",
-        "nimcrypto",
-        "bearssl",
-        "results",
-        "zlib"
-      ],
-      "checksums": {
-        "sha1": "3c424661eff56c925b01e1cd1a911ff744e72962"
-      }
-    },
-    "json_rpc": {
-      "version": "0.5.4",
-      "vcsRevision": "b6e40a776fa2d00b97a9366761fb7da18f31ae5c",
-      "url": "https://github.com/status-im/nim-json-rpc",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew",
-        "nimcrypto",
-        "stint",
-        "chronos",
-        "httputils",
-        "chronicles",
-        "websock",
-        "serialization",
-        "json_serialization",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "d8e8be795fcf098f4ce03b5826f6b3153f6a6e07"
-      }
-    },
-    "jwt": {
-      "version": "0.2",
-      "vcsRevision": "18f8378de52b241f321c1f9ea905456e89b95c6f",
-      "url": "https://github.com/vacp2p/nim-jwt.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "bearssl",
-        "bearssl_pkey_decoder"
-      ],
-      "checksums": {
-        "sha1": "bcfd6fc9c5e10a52b87117219b7ab5c98136bc8e"
-      }
-    },
-    "lsquic": {
-      "version": "0.0.1",
-      "vcsRevision": "4fb03ee7bfb39aecb3316889fdcb60bec3d0936f",
-      "url": "https://github.com/vacp2p/nim-lsquic",
-      "downloadMethod": "git",
-      "dependencies": [
-        "zlib",
-        "stew",
-        "chronos",
-        "nimcrypto",
-        "unittest2",
-        "chronicles"
-      ],
-      "checksums": {
-        "sha1": "f465fa994346490d0924d162f53d9b5aec62f948"
-      }
-    },
     "libp2p": {
-      "version": "1.15.2",
+      "version": "#ff8d51857b4b79a68468e7bcc27b2026cca02996",
       "vcsRevision": "ff8d51857b4b79a68468e7bcc27b2026cca02996",
       "url": "https://github.com/vacp2p/nim-libp2p.git",
       "downloadMethod": "git",
       "dependencies": [
+        "nim",
         "nimcrypto",
         "dnsclient",
         "bearssl",
@@ -471,79 +575,31 @@
         "sha1": "fa2a7552c6ec860717b77ce34cf0b7afe4570234"
       }
     },
-    "presto": {
-      "version": "0.1.1",
-      "vcsRevision": "d66043dd7ede146442e6c39720c76a20bde5225f",
-      "url": "https://github.com/status-im/nim-presto",
+    "taskpools": {
+      "version": "0.1.0",
+      "vcsRevision": "9e8ccc754631ac55ac2fd495e167e74e86293edb",
+      "url": "https://github.com/status-im/nim-taskpools",
       "downloadMethod": "git",
       "dependencies": [
+        "nim"
+      ],
+      "checksums": {
+        "sha1": "09e1b2fdad55b973724d61227971afc0df0b7a81"
+      }
+    },
+    "ffi": {
+      "version": "0.1.3",
+      "vcsRevision": "06111de155253b34e47ed2aaed1d61d08d62cc1b",
+      "url": "https://github.com/logos-messaging/nim-ffi",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
         "chronos",
         "chronicles",
-        "metrics",
-        "results",
-        "stew"
+        "taskpools"
       ],
       "checksums": {
-        "sha1": "8df97c45683abe2337bdff43b844c4fbcc124ca2"
-      }
-    },
-    "unicodedb": {
-      "version": "0.13.2",
-      "vcsRevision": "66f2458710dc641dd4640368f9483c8a0ec70561",
-      "url": "https://github.com/nitely/nim-unicodedb",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "739102d885d99bb4571b1955f5f12aee423c935b"
-      }
-    },
-    "regex": {
-      "version": "0.26.3",
-      "vcsRevision": "4593305ed1e49731fc75af1dc572dd2559aad19c",
-      "url": "https://github.com/nitely/nim-regex",
-      "downloadMethod": "git",
-      "dependencies": [
-        "unicodedb"
-      ],
-      "checksums": {
-        "sha1": "4d24e7d7441137cd202e16f2359a5807ddbdc31f"
-      }
-    },
-    "toml_serialization": {
-      "version": "0.2.18",
-      "vcsRevision": "b5b387e6fb2a7cc75d54a269b07cc6218361bd46",
-      "url": "https://github.com/status-im/nim-toml-serialization",
-      "downloadMethod": "git",
-      "dependencies": [
-        "faststreams",
-        "serialization",
-        "stew"
-      ],
-      "checksums": {
-        "sha1": "76ae1c2af5dd092849b41750ff29217980dc9ca3"
-      }
-    },
-    "web3": {
-      "version": "0.8.0",
-      "vcsRevision": "cdfe5601d2812a58e54faf53ee634452d01e5918",
-      "url": "https://github.com/status-im/nim-web3",
-      "downloadMethod": "git",
-      "dependencies": [
-        "chronicles",
-        "chronos",
-        "bearssl",
-        "eth",
-        "faststreams",
-        "json_rpc",
-        "serialization",
-        "json_serialization",
-        "nimcrypto",
-        "stew",
-        "stint",
-        "results"
-      ],
-      "checksums": {
-        "sha1": "26a112af032ef1536f97da2ca7364af618a11b80"
+        "sha1": "6f9d49375ea1dc71add55c72ac80a808f238e5b0"
       }
     }
   },
diff --git a/scripts/install_nim.sh b/scripts/install_nim.sh
new file mode 100755
index 000000000..c8d0f439d
--- /dev/null
+++ b/scripts/install_nim.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+# Installs a specific Nim version.
+# Usage: install_nim.sh <nim-version>
+#
+# Installs to ~/.nim/nim-<version>/ and symlinks binaries into ~/.nimble/bin/,
+# which is the idiomatic Nim location already on PATH.
+#
+# Pre-built binaries are downloaded from nim-lang.org when available.
+# Falls back to building from source otherwise (e.g. macOS on older releases).
+
+set -e
+
+NIM_VERSION="${1:-}"
+
+if [ -z "${NIM_VERSION}" ]; then
+  echo "Usage: $0 <nim-version>" >&2
+  exit 1
+fi
+
+# Check if the right version is already installed
+nim_ver=$(nim --version 2>/dev/null | head -1 | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || true)
+if [ "${nim_ver}" = "${NIM_VERSION}" ]; then
+  echo "Nim ${NIM_VERSION} already installed, skipping."
+  exit 0
+fi
+
+if [ -n "${nim_ver}" ]; then
+  newer=$(printf '%s\n%s\n' "${NIM_VERSION}" "${nim_ver}" | sort -V | tail -1)
+  if [ "${newer}" = "${nim_ver}" ]; then
+    echo "WARNING: Nim ${nim_ver} is installed; this repo is validated against ${NIM_VERSION}." >&2
+    echo "WARNING: The build will proceed but may behave differently." >&2
+    exit 0
+  fi
+fi
+
+OS=$(uname -s | tr 'A-Z' 'a-z' | sed 's/darwin/macosx/')
+ARCH=$(uname -m | sed 's/x86_64/x64/;s/aarch64/arm64/')
+
+NIM_DEST="${HOME}/.nim/nim-${NIM_VERSION}"
+BINARY_URL="https://nim-lang.org/download/nim-${NIM_VERSION}-${OS}_${ARCH}.tar.xz"
+WORK_DIR=$(mktemp -d)
+trap 'rm -rf "${WORK_DIR}"' EXIT
+
+echo "Checking for pre-built Nim ${NIM_VERSION} (${OS}_${ARCH})..."
+HTTP_STATUS=$(curl -sI "${BINARY_URL}" | head -1 | grep -oE '[0-9]{3}' || true)
+
+if [ "${HTTP_STATUS}" = "200" ]; then
+  echo "Downloading pre-built binary from ${BINARY_URL}..."
+  curl -fL "${BINARY_URL}" -o "${WORK_DIR}/nim.tar.xz"
+  tar -xJf "${WORK_DIR}/nim.tar.xz" -C "${WORK_DIR}"
+  rm -rf "${NIM_DEST}"
+  mkdir -p "${HOME}/.nim"
+  cp -r "${WORK_DIR}/nim-${NIM_VERSION}" "${NIM_DEST}"
+else
+  echo "No pre-built binary found for ${OS}_${ARCH}. Building from source..."
+  SRC_URL="https://github.com/nim-lang/Nim/archive/refs/tags/v${NIM_VERSION}.tar.gz"
+  curl -fL "${SRC_URL}" -o "${WORK_DIR}/nim-src.tar.gz"
+  tar -xzf "${WORK_DIR}/nim-src.tar.gz" -C "${WORK_DIR}"
+  cd "${WORK_DIR}/Nim-${NIM_VERSION}"
+  sh build_all.sh
+  rm -rf "${NIM_DEST}"
+  mkdir -p "${HOME}/.nim"
+  cp -r "${WORK_DIR}/Nim-${NIM_VERSION}" "${NIM_DEST}"
+fi
+
+mkdir -p "${HOME}/.nimble/bin"
+for bin_path in "${NIM_DEST}/bin/"*; do
+  ln -sf "${bin_path}" "${HOME}/.nimble/bin/$(basename "${bin_path}")"
+done
+
+echo "Nim ${NIM_VERSION} installed to ${NIM_DEST}"
+echo "Binaries symlinked in ~/.nimble/bin — ensure it is in your PATH."
diff --git a/waku.nimble b/waku.nimble
index 3a7956873..d99f05e84 100644
--- a/waku.nimble
+++ b/waku.nimble
@@ -8,13 +8,11 @@ version = "0.37.4"
 author = "Status Research & Development GmbH"
 description = "Waku, Private P2P Messaging for Resource-Restricted Devices"
 license = "MIT or Apache License 2.0"
-#bin           = @["build/waku"]
 
-## This indicates the nim compiler version we are currently working on. It may compile with others
-## but we haven't tested.
-const NimVersion    = "2.2.4"
-## This is the underlying nimble version that gets installed after doing `choosenim 2.2.4`.
-const NimbleVersion = "0.18.2"
+const RequiredNimVersion = "2.2.4"
+  ## This is the nim compiler version that we are working on. Other versions may behave differently.
+const RequiredNimbleVersion = "0.22.3"
+  ## Enforced nimble version to ensure a reproducible flow
 
 ### Dependencies
 requires "nim >= 2.2.4",
@@ -41,7 +39,7 @@ requires "nim >= 2.2.4",
   "secp256k1",
   "bearssl",
   # RPC & APIs
-  "json_rpc",
+  "https://github.com/status-im/nim-json-rpc.git#43bbf499143eb45046c83ac9794c9e3280a2b8e7",
   "presto",
   "web3",
   # Database