diff --git a/clamav/Dockerfile b/clamav/Dockerfile
index eb7e9f2a..558d1e85 100644
--- a/clamav/Dockerfile
+++ b/clamav/Dockerfile
@@ -1,11 +1,6 @@
 FROM alpine
 
-RUN apk add --update \
-      clamav \
-      rsyslog \
-      wget \
- && rm -rf /var/cache/apk/*
-
+RUN apk add --no-cache clamav rsyslog wget
 
 COPY conf /etc/clamav
 COPY start.sh /start.sh
diff --git a/dovecot/Dockerfile b/dovecot/Dockerfile
index 1968074e..ee80fe42 100644
--- a/dovecot/Dockerfile
+++ b/dovecot/Dockerfile
@@ -1,11 +1,10 @@
 FROM alpine:edge
 
 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
- && apk add --update \
+ && apk add --no-cache \
      dovecot dovecot-sqlite dovecot-pigeonhole-plugin dovecot-pigeonhole-plugin-extdata \
      rspamd-client@testing \
-     bash \
- && rm -rf /var/cache/apk/*
+     bash
 
 COPY conf /etc/dovecot
 COPY sieve /var/lib/dovecot
diff --git a/fetchmail/Dockerfile b/fetchmail/Dockerfile
index 7c7d9f3d..a44c6e50 100644
--- a/fetchmail/Dockerfile
+++ b/fetchmail/Dockerfile
@@ -1,9 +1,6 @@
 FROM python:alpine
 
-RUN apk add --update \
-    fetchmail \
-    ca-certificates \
- && rm -rf /var/cache/apk/*
+RUN apk add --no-cache fetchmail ca-certificates
 
 COPY fetchmail.py /fetchmail.py
 
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 12dcb11f..b253ee35 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -1,6 +1,6 @@
 FROM nginx:alpine
 
-RUN apk add --update nginx-lua openssl && rm -rf /var/cache/apk/*
+RUN apk add --no-cache nginx-lua openssl
 
 COPY nginx.conf.default /etc/nginx/nginx.conf.default
 COPY nginx.conf.fallback /etc/nginx/nginx.conf.fallback
diff --git a/postfix/Dockerfile b/postfix/Dockerfile
index de17b312..2408ef3e 100644
--- a/postfix/Dockerfile
+++ b/postfix/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine
 
-RUN apk add --update bash postfix postfix-sqlite postfix-pcre rsyslog && rm -rf /var/cache/apk/*
+RUN apk add --no-cache bash postfix postfix-sqlite postfix-pcre rsyslog
 
 COPY conf /etc/postfix
 COPY rsyslog.conf /etc/rsyslog.conf
diff --git a/radicale/Dockerfile b/radicale/Dockerfile
index 6c666374..b42548e6 100644
--- a/radicale/Dockerfile
+++ b/radicale/Dockerfile
@@ -1,9 +1,7 @@
 FROM alpine:edge
 
 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
- && apk add --update \
-     radicale@testing \
- && rm -rf /var/cache/apk/*
+ && apk add --no-cache radicale@testing
 
 COPY radicale.conf /radicale.conf
 
diff --git a/rmilter/Dockerfile b/rmilter/Dockerfile
index 41999852..9f474de7 100644
--- a/rmilter/Dockerfile
+++ b/rmilter/Dockerfile
@@ -1,13 +1,11 @@
 FROM alpine:edge
 
 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
- && apk add --update \
-     rmilter@testing rsyslog \
- && rm -rf /var/cache/apk/*
- 
+ && apk add --no-cache rmilter@testing rsyslog
+
 COPY rmilter.conf /etc/rmilter.conf
 COPY rsyslog.conf /etc/rsyslog.conf
 
 COPY start.sh /start.sh
 
-CMD ["/start.sh"]
\ No newline at end of file
+CMD ["/start.sh"]