diff --git a/Makefile b/Makefile
index 2178372cd..67f14296a 100644
--- a/Makefile
+++ b/Makefile
@@ -67,8 +67,11 @@ BUILD_NIM := echo -e $(BUILD_MSG) "Nim compiler" && \
 		rm -rf csources/bin; \
 	} || { \
 		cp -a bin/nim bin/nim_csources; \
-	} && \
-	sh build_all.sh $(HANDLE_OUTPUT)
+	} && { \
+		sed 's/koch tools/koch --stable tools/' build_all.sh > build_all_custom.sh; \
+		sh build_all_custom.sh $(HANDLE_OUTPUT); \
+		rm build_all_custom.sh; \
+	}
 NIM_BINARY := $(NIM_DIR)/bin/nim$(EXE_SUFFIX)
 # md5sum - macOS is a special case
 ifeq ($(shell uname), Darwin)
diff --git a/vendor/go/src/github.com/libp2p/go-libp2p-daemon b/vendor/go/src/github.com/libp2p/go-libp2p-daemon
index d048665c3..5cd632518 160000
--- a/vendor/go/src/github.com/libp2p/go-libp2p-daemon
+++ b/vendor/go/src/github.com/libp2p/go-libp2p-daemon
@@ -1 +1 @@
-Subproject commit d048665c339ac1b6fa8c9ac1dac6d1b8d59959ec
+Subproject commit 5cd632518bc4aff88ea92e5b8639dc316c776dc3
diff --git a/vendor/nim-beacon-chain b/vendor/nim-beacon-chain
index 4d338ab05..8b2fd73e2 160000
--- a/vendor/nim-beacon-chain
+++ b/vendor/nim-beacon-chain
@@ -1 +1 @@
-Subproject commit 4d338ab05eed18a3996dd12eff6faccce046e887
+Subproject commit 8b2fd73e254eb559cc817245979a7916b92c20b5
diff --git a/vendor/nim-chronos b/vendor/nim-chronos
index 1ffa329fe..04b60a0e4 160000
--- a/vendor/nim-chronos
+++ b/vendor/nim-chronos
@@ -1 +1 @@
-Subproject commit 1ffa329fe1189b0906e223ae5f42e1ae2cf97c70
+Subproject commit 04b60a0e4060cea81ddd883a991a2658074f4689
diff --git a/vendor/nim-eth b/vendor/nim-eth
index 0b01d1f02..e1dbd76e1 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit 0b01d1f02831098e7cc9be734ddbe12c96dd38ee
+Subproject commit e1dbd76e1f2d6b8e75b5ee966709d9b73c12c990
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index 6f4f86ec8..d685147c5 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit 6f4f86ec88b14e7f2e0959f537857adedb8f2c06
+Subproject commit d685147c52b189d5da22e00c48b7fb4ea8a22ea8
diff --git a/vendor/nim-nat-traversal b/vendor/nim-nat-traversal
index c8977fee5..a2111b324 160000
--- a/vendor/nim-nat-traversal
+++ b/vendor/nim-nat-traversal
@@ -1 +1 @@
-Subproject commit c8977fee53403d688c29702490da9dd4e4d09c11
+Subproject commit a2111b3246171ae240c3a812aac46da3567a1198
diff --git a/vendor/nimble b/vendor/nimble
index 3d6dc90cd..c8d79fc02 160000
--- a/vendor/nimble
+++ b/vendor/nimble
@@ -1 +1 @@
-Subproject commit 3d6dc90cd4dfc12b8ae9d1958e84610cf21b34bb
+Subproject commit c8d79fc0228682677330a9f57d14389aaa641153