diff --git a/Dockerfile b/Dockerfile
index 860b18c7048b3b3d7fd1ad876f7105948d719a05..c12a8b1f4edf594560944008227f1c80dbe0bd73 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,3 +25,5 @@ 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
+
+ENTRYPOINT ["bor"]
diff --git a/Dockerfile.alltools b/Dockerfile.alltools
index 10cf1392e7eb00c64adf476fbaba20e6d21a91d5..53be8bc95043ac5e4768d81b86b7d83a65188a73 100644
--- a/Dockerfile.alltools
+++ b/Dockerfile.alltools
@@ -9,7 +9,10 @@ RUN cd /bor && make bor-all
 # Pull all binaries into a second stage deploy alpine container
 FROM alpine:latest
 
-RUN apk add --no-cache ca-certificates
+RUN set -x \
+    && apk add --update --no-cache \
+       ca-certificates \
+    && rm -rf /var/cache/apk/*
 COPY --from=builder /bor/build/bin/* /usr/local/bin/
 
-EXPOSE 8545 8546 30303 30303/udp
\ No newline at end of file
+EXPOSE 8545 8546 30303 30303/udp