diff --git a/.gitmodules b/.gitmodules
index 083b23fb34..223b8a535a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -136,8 +136,3 @@
 	url = https://github.com/arnetheduck/nim-result.git
 	ignore = dirty
 	branch = master
-[submodule "vendor/nim-byteutils"]
-	path = vendor/nim-byteutils
-	url = https://github.com/status-im/nim-byteutils.git
-	ignore = dirty
-	branch = master
diff --git a/env.sh b/env.sh
index 84f4c4930b..f90ba9a74c 100755
--- a/env.sh
+++ b/env.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
 
-source vendor/nimbus-build-system/scripts/env.sh
+# We use ${BASH_SOURCE[0]} instead of $0 to allow sourcing this file
+# and we fall back to a Zsh-specific special var to also support Zsh.
+REL_PATH="$(dirname ${BASH_SOURCE[0]:-${(%):-%x}})"
+ABS_PATH="$(cd ${REL_PATH}; pwd)"
+source ${ABS_PATH}/vendor/nimbus-build-system/scripts/env.sh
 
diff --git a/vendor/nim-blscurve b/vendor/nim-blscurve
index a4c7050f89..73f2ea86e9 160000
--- a/vendor/nim-blscurve
+++ b/vendor/nim-blscurve
@@ -1 +1 @@
-Subproject commit a4c7050f89a42b997ff7c2b398e6c40120196b15
+Subproject commit 73f2ea86e94b5b08e3e1d168912d711fd5f7c2dc
diff --git a/vendor/nim-byteutils b/vendor/nim-byteutils
deleted file mode 160000
index 69ce66ef43..0000000000
--- a/vendor/nim-byteutils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 69ce66ef434b03cf8938be8aa5c658982aeccb40
diff --git a/vendor/nim-chronicles b/vendor/nim-chronicles
index 563a0e8195..743f14cf68 160000
--- a/vendor/nim-chronicles
+++ b/vendor/nim-chronicles
@@ -1 +1 @@
-Subproject commit 563a0e81958c0500f5b9a6ff7ab2c709899d0118
+Subproject commit 743f14cf68f213a0cbead5e6dfc00ee3edc7fe1e
diff --git a/vendor/nim-chronos b/vendor/nim-chronos
index 6d7864aa84..d3eac1d643 160000
--- a/vendor/nim-chronos
+++ b/vendor/nim-chronos
@@ -1 +1 @@
-Subproject commit 6d7864aa84010271cb8a4a8614c722bae50702cd
+Subproject commit d3eac1d64341a45547ad298dcd9fcb34523473b8
diff --git a/vendor/nim-eth b/vendor/nim-eth
index f3aad8f925..bef28a18e5 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit f3aad8f9252166e66c1b2a96a522ea0d1243db61
+Subproject commit bef28a18e58f52f24bcc50f0cadefac0224d4630
diff --git a/vendor/nim-faststreams b/vendor/nim-faststreams
index 6bbe1c21b6..1e85ab9150 160000
--- a/vendor/nim-faststreams
+++ b/vendor/nim-faststreams
@@ -1 +1 @@
-Subproject commit 6bbe1c21b63c1f9b8698a91a3548cbd8aa6b0d25
+Subproject commit 1e85ab9150dd3759c86b2a6c9148f3fad3d1694c
diff --git a/vendor/nim-http-utils b/vendor/nim-http-utils
index 7e456be185..21613254e8 160000
--- a/vendor/nim-http-utils
+++ b/vendor/nim-http-utils
@@ -1 +1 @@
-Subproject commit 7e456be185e42f59b8218cd4f15a6c98d9430bd9
+Subproject commit 21613254e8b2f95c9cb44fafb0ac1b10bbf2e046
diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc
index 07e82fa194..9214b095fb 160000
--- a/vendor/nim-json-rpc
+++ b/vendor/nim-json-rpc
@@ -1 +1 @@
-Subproject commit 07e82fa19499d10012c9d125a61ac565a01e3305
+Subproject commit 9214b095fb0266e5cac44804663343cd8288a84c
diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization
index f4bd22e054..173c7b4a86 160000
--- a/vendor/nim-json-serialization
+++ b/vendor/nim-json-serialization
@@ -1 +1 @@
-Subproject commit f4bd22e054b5d5a1419710141ac01bd5f1629e22
+Subproject commit 173c7b4a86e6d75a69577166526b0f5840c45003
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index 2670cd8433..0df2f05bfc 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit 2670cd84331b270313c7348e120dcbbcf9a98988
+Subproject commit 0df2f05bfcc07409ac99c3cbe8cef3cad20aad6d
diff --git a/vendor/nim-metrics b/vendor/nim-metrics
index b77efb8d0d..d4492f0d0a 160000
--- a/vendor/nim-metrics
+++ b/vendor/nim-metrics
@@ -1 +1 @@
-Subproject commit b77efb8d0d8c0137857d6281a47c230df0ffee1b
+Subproject commit d4492f0d0ae9d2c46cc3dde2d947bc175ae420de
diff --git a/vendor/nim-rocksdb b/vendor/nim-rocksdb
index 5b1307cb1f..08fec021c0 160000
--- a/vendor/nim-rocksdb
+++ b/vendor/nim-rocksdb
@@ -1 +1 @@
-Subproject commit 5b1307cb1f4c85bb72ff781d810fb8c0148b1183
+Subproject commit 08fec021c0f28f63d1221d40a655078b5b923d1b
diff --git a/vendor/nim-secp256k1 b/vendor/nim-secp256k1
index a41d4432a1..85b2620a6e 160000
--- a/vendor/nim-secp256k1
+++ b/vendor/nim-secp256k1
@@ -1 +1 @@
-Subproject commit a41d4432a17a8d024e5bb47c9bdcc641ef309e97
+Subproject commit 85b2620a6e4c41eaa4caa378bd70902cff5a1c48
diff --git a/vendor/nim-stew b/vendor/nim-stew
index 43bbe48e5f..a81d1fac85 160000
--- a/vendor/nim-stew
+++ b/vendor/nim-stew
@@ -1 +1 @@
-Subproject commit 43bbe48e5f8181b7ca8923e6edf78dec635e8aea
+Subproject commit a81d1fac850119c2ede9f3997332fa9f0a2ad3d8
diff --git a/vendor/nim-stint b/vendor/nim-stint
index d0162902b7..9993b9dca4 160000
--- a/vendor/nim-stint
+++ b/vendor/nim-stint
@@ -1 +1 @@
-Subproject commit d0162902b7f5ef2e18ff516e96014196d527cedc
+Subproject commit 9993b9dca4a2dbf76bc432252ad4e8db944ae831
diff --git a/vendor/nim-web3 b/vendor/nim-web3
index 6ca87380a6..58d78cfa7f 160000
--- a/vendor/nim-web3
+++ b/vendor/nim-web3
@@ -1 +1 @@
-Subproject commit 6ca87380a616afa2f66de4fc2f8bf3ca05576995
+Subproject commit 58d78cfa7fe2bedd16ed57708c2fc206cf254d89