diff --git a/.gitmodules b/.gitmodules
index 915880a09..116acab0d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,205 +1,205 @@
 [submodule "vendor/nim-eth2-scenarios"]
 	path = vendor/nim-eth2-scenarios
 	url = https://github.com/status-im/nim-eth2-scenarios
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-blscurve"]
 	path = vendor/nim-blscurve
 	url = https://github.com/status-im/nim-blscurve.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-confutils"]
 	path = vendor/nim-confutils
 	url = https://github.com/status-im/nim-confutils.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-libp2p"]
 	path = vendor/nim-libp2p
 	url = https://github.com/status-im/nim-libp2p.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nimbus-build-system"]
 	path = vendor/nimbus-build-system
 	url = https://github.com/status-im/nimbus-build-system.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/NimYAML"]
 	path = vendor/NimYAML
 	url = https://github.com/status-im/NimYAML.git
-	ignore = dirty
+	ignore = untracked
 	branch = devel
 [submodule "vendor/nim-web3"]
 	path = vendor/nim-web3
 	url = https://github.com/status-im/nim-web3.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-nat-traversal"]
 	path = vendor/nim-nat-traversal
 	url = https://github.com/status-im/nim-nat-traversal.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nimcrypto"]
 	path = vendor/nimcrypto
 	url = https://github.com/cheatfate/nimcrypto.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-stew"]
 	path = vendor/nim-stew
 	url = https://github.com/status-im/nim-stew.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-chronos"]
 	path = vendor/nim-chronos
 	url = https://github.com/status-im/nim-chronos.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-chronicles"]
 	path = vendor/nim-chronicles
 	url = https://github.com/status-im/nim-chronicles.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-faststreams"]
 	path = vendor/nim-faststreams
 	url = https://github.com/status-im/nim-faststreams.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-serialization"]
 	path = vendor/nim-serialization
 	url = https://github.com/status-im/nim-serialization.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-json-serialization"]
 	path = vendor/nim-json-serialization
 	url = https://github.com/status-im/nim-json-serialization.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-eth"]
 	path = vendor/nim-eth
 	url = https://github.com/status-im/nim-eth.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-stint"]
 	path = vendor/nim-stint
 	url = https://github.com/status-im/nim-stint.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-metrics"]
 	path = vendor/nim-metrics
 	url = https://github.com/status-im/nim-metrics.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-secp256k1"]
 	path = vendor/nim-secp256k1
 	url = https://github.com/status-im/nim-secp256k1.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-http-utils"]
 	path = vendor/nim-http-utils
 	url = https://github.com/status-im/nim-http-utils.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-json-rpc"]
 	path = vendor/nim-json-rpc
 	url = https://github.com/status-im/nim-json-rpc.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/news"]
 	path = vendor/news
 	url = https://github.com/status-im/news.git
-	ignore = dirty
+	ignore = untracked
 	branch = status
 [submodule "vendor/nim-prompt"]
 	path = vendor/nim-prompt
 	url = https://github.com/status-im/nim-prompt.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-unicodedb"]
 	path = vendor/nim-unicodedb
 	url = https://github.com/nitely/nim-unicodedb.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-bearssl"]
 	path = vendor/nim-bearssl
 	url = https://github.com/status-im/nim-bearssl.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-libbacktrace"]
 	path = vendor/nim-libbacktrace
 	url = https://github.com/status-im/nim-libbacktrace.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-sqlite3-abi"]
 	path = vendor/nim-sqlite3-abi
 	url = https://github.com/arnetheduck/nim-sqlite3-abi.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-testutils"]
 	path = vendor/nim-testutils
 	url = https://github.com/status-im/nim-testutils.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-snappy"]
 	path = vendor/nim-snappy
 	url = https://github.com/status-im/nim-snappy.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-protobuf-serialization"]
 	path = vendor/nim-protobuf-serialization
 	url = https://github.com/status-im/nim-protobuf-serialization.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-rocksdb"]
 	path = vendor/nim-rocksdb
 	url = https://github.com/status-im/nim-rocksdb.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/asynctools"]
 	path = vendor/asynctools
 	url = https://github.com/cheatfate/asynctools.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/karax"]
 	path = vendor/karax
 	url = https://github.com/pragmagic/karax.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/jswebsockets"]
 	path = vendor/jswebsockets
 	url = https://github.com/stisa/jswebsockets.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/websocket.nim"]
 	path = vendor/websocket.nim
 	url = https://github.com/niv/websocket.nim.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-chronicles-tail"]
 	path = vendor/nim-chronicles-tail
 	url = https://github.com/status-im/nim-chronicles-tail.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/eth2-testnets"]
 	path = vendor/eth2-testnets
 	url = https://github.com/eth2-clients/eth2-testnets.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nimbus-security-resources"]
 	path = vendor/nimbus-security-resources
 	url = https://github.com/status-im/nimbus-security-resources.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-normalize"]
 	path = vendor/nim-normalize
 	url = https://github.com/nitely/nim-normalize.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nim-zxcvbn"]
 	path = vendor/nim-zxcvbn
 	url = https://github.com/status-im/nim-zxcvbn.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
 [submodule "vendor/nimbus-benchmarking"]
 	path = vendor/nimbus-benchmarking
 	url = https://github.com/status-im/nimbus-benchmarking.git
-	ignore = dirty
+	ignore = untracked
 	branch = master
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index f7c732a15..53870bc6b 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit f7c732a150bb4dad68eb8bb99a727b5f42083201
+Subproject commit 53870bc6bccf0f09f9c50a923d1fa1fb235d2db0