diff --git a/Dockerfile b/Dockerfile
index 6bf13dc316..c7ba941f2f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,18 @@
-FROM alpine:3.5
+FROM alpine:3.5 as builder
 
 ADD . /go-ethereum
+ARG MAKE_TARGET=geth
 RUN \
   apk add --update git go make gcc musl-dev linux-headers && \
-  (cd go-ethereum && make geth)                           && \
-  cp go-ethereum/build/bin/geth /usr/local/bin/           && \
-  apk del git go make gcc musl-dev linux-headers          && \
-  rm -rf /go-ethereum && rm -rf /var/cache/apk/*
+  (cd go-ethereum && make $MAKE_TARGET)                   && \
+  echo "Dockerfile builder stage finished."
+#  cp go-ethereum/build/bin/geth /usr/local/bin/           && \
+#  apk del git go make gcc musl-dev linux-headers         && \
+#  rm -rf /go-ethereum && rm -rf /var/cache/apk/*
+
+FROM alpine:3.5
+
+COPY --from=builder /go-ethereum/build/bin/* /usr/local/bin/
 
 EXPOSE 8545
 EXPOSE 30303