diff --git a/apache/Dockerfile b/apache/Dockerfile
index e6bff6ceb..1c0d7341e 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -2,6 +2,11 @@ FROM php:8.1-apache
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
+# This should be done by the upstream images, but as long as they don't do it,
+# we rather use our own hands than suffer from outdated packages.
+# Kept as standalone command to make it stand out and be easy to remove.
+RUN apt-get update && apt-get upgrade && apt-get clean
+
 RUN set -ex; \
 	if [ "apache" = "apache" ]; then a2enmod rewrite; fi; \
 	apt-get update; \
diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index e53feb615..8075fed9a 100644
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -2,6 +2,11 @@ FROM php:8.1-fpm-alpine
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
+# This should be done by the upstream images, but as long as they don't do it,
+# we rather use our own hands than suffer from outdated packages.
+# Kept as standalone command to make it stand out and be easy to remove.
+RUN apk upgrade --no-cache
+
 RUN set -ex; \
 	if [ "fpm-alpine" = "apache" ]; then a2enmod rewrite; fi; \
 	\
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 55381ce3c..00ef925ce 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -2,6 +2,11 @@ FROM php:8.1-fpm
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
+# This should be done by the upstream images, but as long as they don't do it,
+# we rather use our own hands than suffer from outdated packages.
+# Kept as standalone command to make it stand out and be easy to remove.
+RUN apt-get update && apt-get upgrade && apt-get clean
+
 RUN set -ex; \
 	if [ "fpm" = "apache" ]; then a2enmod rewrite; fi; \
 	apt-get update; \
diff --git a/templates/Dockerfile-alpine.templ b/templates/Dockerfile-alpine.templ
index bb207d111..58bfc0271 100644
--- a/templates/Dockerfile-alpine.templ
+++ b/templates/Dockerfile-alpine.templ
@@ -2,6 +2,11 @@ FROM php:8.1-%%VARIANT%%
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
+# This should be done by the upstream images, but as long as they don't do it,
+# we rather use our own hands than suffer from outdated packages.
+# Kept as standalone command to make it stand out and be easy to remove.
+RUN apk upgrade --no-cache
+
 RUN set -ex; \
 	if [ "%%VARIANT%%" = "apache" ]; then a2enmod rewrite; fi; \
 	\
diff --git a/templates/Dockerfile-debian.templ b/templates/Dockerfile-debian.templ
index 62c3eba37..ca393ba28 100644
--- a/templates/Dockerfile-debian.templ
+++ b/templates/Dockerfile-debian.templ
@@ -2,6 +2,11 @@ FROM php:8.1-%%VARIANT%%
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
+# This should be done by the upstream images, but as long as they don't do it,
+# we rather use our own hands than suffer from outdated packages.
+# Kept as standalone command to make it stand out and be easy to remove.
+RUN apt-get update && apt-get upgrade && apt-get clean
+
 RUN set -ex; \
 	if [ "%%VARIANT%%" = "apache" ]; then a2enmod rewrite; fi; \
 	apt-get update; \