diff --git a/docker/beacon_node/Dockerfile b/docker/beacon_node/Dockerfile
index 2e48bef09..b494534e7 100644
--- a/docker/beacon_node/Dockerfile
+++ b/docker/beacon_node/Dockerfile
@@ -10,7 +10,8 @@ ARG GIT_REVISION
 RUN git clone https://github.com/status-im/nimbus.git \
  && cd nimbus \
  && git reset --hard ${GIT_REVISION} \
- && make update deps nat-libs
+ && make update deps vendor/go/bin/p2pd nat-libs \
+ && cp vendor/go/bin/p2pd /usr/bin/p2pd
 
 ARG NETWORK
 ARG NETWORK_BACKEND
@@ -41,7 +42,8 @@ RUN apt update \
  && apt clean \
  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-COPY --from=build /usr/bin/beacon_node /usr/bin/beacon_node 
+COPY --from=build /usr/bin/beacon_node /usr/bin/beacon_node
+COPY --from=build /usr/bin/p2pd /usr/bin/p2pd
 
 MAINTAINER Zahary Karadjov <zahary@status.im>
 LABEL description="Nimbus installation that can act as an ETH2 network bootstrap node."
diff --git a/vendor/nim-beacon-chain b/vendor/nim-beacon-chain
index 10c7920b2..b1423c5b9 160000
--- a/vendor/nim-beacon-chain
+++ b/vendor/nim-beacon-chain
@@ -1 +1 @@
-Subproject commit 10c7920b274f61e70531a5318e1ea0e4f61e65f2
+Subproject commit b1423c5b9abadab286c91c8d245d61427a78d941
diff --git a/vendor/nim-eth b/vendor/nim-eth
index ee27111e2..9bb491370 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit ee27111e2b95dc1ec7b15c55b8cfaca958015f67
+Subproject commit 9bb4913707b0ebabf795bdee954c2080802de999
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index d685147c5..d84ed6393 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit d685147c52b189d5da22e00c48b7fb4ea8a22ea8
+Subproject commit d84ed639320507aee79dd7295b2af7b8cdfd6cc6
diff --git a/vendor/nim-std-shims b/vendor/nim-std-shims
index 58a313d8e..7fa381eb8 160000
--- a/vendor/nim-std-shims
+++ b/vendor/nim-std-shims
@@ -1 +1 @@
-Subproject commit 58a313d8eb5750dc9b1c9f7f0bdebb08fb5023d3
+Subproject commit 7fa381eb8d12a21bd1c7a1b99217b4cf8acacc46