diff --git a/Dockerfile b/Dockerfile
index c12a8b1f4edf..c3d13aa17a03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,29 +1,17 @@
-# Build Geth in a stock Go builder container
-FROM golang:1.17-alpine as builder
+FROM golang:latest
 
-RUN set -x \
-	&& buildDeps='bash build-base musl-dev linux-headers git' \
-	&& apk add --update $buildDeps \
-	&& rm -rf /var/cache/apk/* \
+ARG BOR_DIR=/bor
+ENV BOR_DIR=$BOR_DIR
+
+RUN apt-get update -y && apt-get upgrade -y \
+    && apt install build-essential git tini -y \
     && mkdir -p /bor
 
-WORKDIR /bor
+WORKDIR ${BOR_DIR}
 COPY . .
 RUN make bor-all
 
-CMD ["/bin/bash"]
-
-# Pull Bor into a second stage deploy alpine container
-FROM alpine:3.14
-
-RUN set -x \
-    && apk add --update --no-cache \
-       ca-certificates \
-    && 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/
-
+ENV SHELL /bin/bash
 EXPOSE 8545 8546 8547 30303 30303/udp
 
 ENTRYPOINT ["bor"]