diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile
index ed3e672773..351499df2c 100644
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -6,7 +6,7 @@ ENV LANG='C.UTF-8' \
 
 RUN set -ex; \
     apt-get -qq update; \
-    apt-get -qq upgrade; \
+    apt-get -qq dist-upgrade; \
     apt-get -qqy --no-install-recommends install \
         python3 \
         unzip \
@@ -353,6 +353,7 @@ RUN set -ex; \
 
 RUN set -ex; \
     apt-get -qq update; \
+    apt-get -qq dist-upgrade; \
     apt-get -qqy install --no-install-recommends \
       redis-tools \
       gnupg2 \
@@ -435,6 +436,7 @@ RUN set -ex; \
     echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt noble-pgdg main" >> /etc/apt/sources.list.d/postgresql.list; \
     apt-get -qq update; \
     apt-get -qqy install postgresql-client-16; \
+    apt-get clean; \
     rm -rf /var/lib/apt/lists/*;
 
 
diff --git a/docker/images/Dockerfile.backend b/docker/images/Dockerfile.backend
index 9b61bf204e..7c89c3a368 100644
--- a/docker/images/Dockerfile.backend
+++ b/docker/images/Dockerfile.backend
@@ -10,7 +10,7 @@ ENV LANG='C.UTF-8' \
 
 RUN set -ex; \
     apt-get -qq update; \
-    apt-get -qq upgrade; \
+    apt-get -qq dist-upgrade; \
     apt-get -qqy --no-install-recommends install \
         binutils \
         ca-certificates \
@@ -85,7 +85,7 @@ ENV LANG='C.UTF-8' \
 RUN set -ex; \
     useradd -U -M -u 1001 -s /bin/false -d /opt/penpot penpot; \
     apt-get -qq update; \
-    apt-get -qq upgrade; \
+    apt-get -qq dist-upgrade; \
     apt-get -qqy --no-install-recommends install \
         ca-certificates \
         curl \
diff --git a/docker/images/Dockerfile.exporter b/docker/images/Dockerfile.exporter
index d403744ae6..a92b87d184 100644
--- a/docker/images/Dockerfile.exporter
+++ b/docker/images/Dockerfile.exporter
@@ -13,7 +13,7 @@ RUN set -ex; \
     mkdir -p /etc/resolvconf/resolv.conf.d; \
     echo "nameserver 127.0.0.11" > /etc/resolvconf/resolv.conf.d/tail; \
     apt-get -qq update; \
-    apt-get -qq upgrade; \
+    apt-get -qq dist-upgrade; \
     apt-get -qqy --no-install-recommends install \
       curl \
       tzdata \
diff --git a/docker/images/Dockerfile.mcp b/docker/images/Dockerfile.mcp
index 3861ce2b5c..96cf10f824 100644
--- a/docker/images/Dockerfile.mcp
+++ b/docker/images/Dockerfile.mcp
@@ -13,7 +13,7 @@ RUN set -ex; \
     mkdir -p /etc/resolvconf/resolv.conf.d; \
     echo "nameserver 127.0.0.11" > /etc/resolvconf/resolv.conf.d/tail; \
     apt-get -qq update; \
-    apt-get -qq upgrade; \
+    apt-get -qq dist-upgrade; \
     apt-get -qqy --no-install-recommends install \
       curl \
       tzdata \