diff --git a/.gitmodules b/.gitmodules
index c1aac4497..d02f3df55 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -63,11 +63,6 @@
 	url = https://github.com/status-im/nim-secp256k1.git
 	ignore = dirty
 	branch = master
-[submodule "vendor/snappy"]
-	path = vendor/snappy
-	url = https://github.com/jangko/snappy.git
-	ignore = dirty
-	branch = master
 [submodule "vendor/nim-bncurve"]
 	path = vendor/nim-bncurve
 	url = https://github.com/status-im/nim-bncurve.git
@@ -147,3 +142,13 @@
 	url = https://github.com/status-im/nim-byteutils.git
 	ignore = dirty
 	branch = master
+[submodule "vendor/nim-snappy"]
+	path = vendor/nim-snappy
+	url = https://github.com/status-im/nim-snappy.git
+	ignore = dirty
+	branch = master
+[submodule "vendor/NimYAML"]
+	path = vendor/NimYAML
+	url = https://github.com/flyx/NimYAML.git
+	ignore = dirty
+	branch = master
diff --git a/env.sh b/env.sh
index d3888ad19..827c907da 100755
--- a/env.sh
+++ b/env.sh
@@ -9,6 +9,8 @@ abs_path="$(cd $rel_path; pwd)"
 # do we still need this?
 abs_path_native="$(cd $rel_path; ${PWD_CMD})"
 
+export NIMBUS_ENV_DIR="${abs_path}"
+
 # used by libp2p/go-libp2p-daemon
 export GOPATH="${abs_path}/vendor/go"
 export GO111MODULE=on
diff --git a/vendor/NimYAML b/vendor/NimYAML
new file mode 160000
index 000000000..0336d0611
--- /dev/null
+++ b/vendor/NimYAML
@@ -0,0 +1 @@
+Subproject commit 0336d0611466580ab0b58a19b5ad57477d8f34d1
diff --git a/vendor/nim-beacon-chain b/vendor/nim-beacon-chain
index 7a4b7a6cf..a897ab9c7 160000
--- a/vendor/nim-beacon-chain
+++ b/vendor/nim-beacon-chain
@@ -1 +1 @@
-Subproject commit 7a4b7a6cfb9ca3d0a169de20df75980622c9db07
+Subproject commit a897ab9c70bbbe3ba74c9b6cd72e78a0ee6db1a5
diff --git a/vendor/nim-chronicles b/vendor/nim-chronicles
index 6cba1d945..d40ad42b7 160000
--- a/vendor/nim-chronicles
+++ b/vendor/nim-chronicles
@@ -1 +1 @@
-Subproject commit 6cba1d945d400f379ad33c3c24cebfa73398d3b0
+Subproject commit d40ad42b7d7e71a64f40a405aae6e1f8f520a2d5
diff --git a/vendor/nim-eth b/vendor/nim-eth
index aef752278..c2528399e 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit aef752278829c9d7df8cbe5f8c1c98db9f41322f
+Subproject commit c2528399e7c3365afbb46f278841333fdd40b8df
diff --git a/vendor/nim-faststreams b/vendor/nim-faststreams
index 5135173f6..6bbe1c21b 160000
--- a/vendor/nim-faststreams
+++ b/vendor/nim-faststreams
@@ -1 +1 @@
-Subproject commit 5135173f60d870717cf8021345137b0f27c75990
+Subproject commit 6bbe1c21b63c1f9b8698a91a3548cbd8aa6b0d25
diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization
index 7922a83c4..f6a7da52e 160000
--- a/vendor/nim-json-serialization
+++ b/vendor/nim-json-serialization
@@ -1 +1 @@
-Subproject commit 7922a83c4d65e97722b068ecc5e7c4308a73d21b
+Subproject commit f6a7da52e052888c7df4c3f12f77085798950979
diff --git a/vendor/nim-serialization b/vendor/nim-serialization
index 171dbde4b..b42502b51 160000
--- a/vendor/nim-serialization
+++ b/vendor/nim-serialization
@@ -1 +1 @@
-Subproject commit 171dbde4b1e39e9ad4ecf57bf88f2ee9cd292788
+Subproject commit b42502b5121b7cc4c50d03f41723b19488717abe
diff --git a/vendor/nim-snappy b/vendor/nim-snappy
new file mode 160000
index 000000000..072c5eee4
--- /dev/null
+++ b/vendor/nim-snappy
@@ -0,0 +1 @@
+Subproject commit 072c5eee4395156df96f73d68bd01bb849f367e2
diff --git a/vendor/nim-stew b/vendor/nim-stew
index 700f21b54..5e11e1f1d 160000
--- a/vendor/nim-stew
+++ b/vendor/nim-stew
@@ -1 +1 @@
-Subproject commit 700f21b54f4652df3bef24147c224ed8a199b624
+Subproject commit 5e11e1f1db0a9090616976861301bdb2a6dda244
diff --git a/vendor/snappy b/vendor/snappy
deleted file mode 160000
index ff70dfbb4..000000000
--- a/vendor/snappy
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ff70dfbb47ce782bdbc29598a7beba5267b285f0