diff --git a/Dockerfile b/Dockerfile
index 2d47a18ba61..02e22e801dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,7 @@ MAINTAINER Thomas Boerger <thomas@webhippie.de>
 
 EXPOSE 22 3000
 
-RUN apk update && \
-  apk add \
+RUN apk -U --no-cache add \
     su-exec \
     ca-certificates \
     sqlite \
@@ -14,10 +13,8 @@ RUN apk update && \
     s6 \
     curl \
     openssh \
-    tzdata && \
-  rm -rf \
-    /var/cache/apk/* && \
-  addgroup \
+    tzdata
+RUN addgroup \
     -S -g 1000 \
     git && \
   adduser \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 795e3548fe7..d9788ee7394 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -2,8 +2,7 @@ FROM aarch64/alpine:3.5
 
 EXPOSE 22 3000
 
-RUN apk update && \
-  apk add \
+RUN apk -U --no-cache add \
     su-exec \
     ca-certificates \
     sqlite \
@@ -13,10 +12,8 @@ RUN apk update && \
     s6 \
     curl \
     openssh \
-    tzdata && \
-  rm -rf \
-    /var/cache/apk/* && \
-  addgroup \
+    tzdata
+RUN addgroup \
     -S -g 1000 \
     git && \
   adduser \
diff --git a/Dockerfile.rpi b/Dockerfile.rpi
index e334ffc0b47..3484b2e6e28 100644
--- a/Dockerfile.rpi
+++ b/Dockerfile.rpi
@@ -3,8 +3,7 @@ MAINTAINER Thomas Boerger <thomas@webhippie.de>
 
 EXPOSE 22 3000
 
-RUN apk update && \
-  apk add \
+RUN apk -U --no-cache add \
     su-exec \
     ca-certificates \
     sqlite \
@@ -14,10 +13,8 @@ RUN apk update && \
     s6 \
     curl \
     openssh \
-    tzdata && \
-  rm -rf \
-    /var/cache/apk/* && \
-  addgroup \
+    tzdata
+RUN addgroup
     -S -g 1000 \
     git && \
   adduser \