diff --git a/Dockerfile b/Dockerfile
index 37f0182bdc66..c12a8b1f4edf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,9 @@ RUN set -x \
 
 WORKDIR /bor
 COPY . .
-RUN go build -o ./build/bin/bor ./command
+RUN make bor-all
+
+CMD ["/bin/bash"]
 
 # Pull Bor into a second stage deploy alpine container
 FROM alpine:3.14
@@ -20,6 +22,7 @@ RUN set -x \
     && rm -rf /var/cache/apk/*
 
 COPY --from=builder /bor/build/bin/bor /usr/local/bin/
+COPY --from=builder /bor/build/bin/bootnode /usr/local/bin/
 
 EXPOSE 8545 8546 8547 30303 30303/udp