diff --git a/config/templates/Dockerfile b/config/templates/Dockerfile
index 42197e3a6b..8ed9e800b3 100644
--- a/config/templates/Dockerfile
+++ b/config/templates/Dockerfile
@@ -3,7 +3,7 @@ FROM $BASE_IMAGE as armbian_builder
 ARG CUSTOM_PACKAGES='g++-11-arm-linux-gnueabihf libssl3'
 ENV CUSTOM_PACKAGES $CUSTOM_PACKAGES
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get -y install \
+RUN apt-get update && apt-get -y dist-upgrade && apt-get -y install \
        joe \
        software-properties-common \
        gnupg \
@@ -21,7 +21,7 @@ RUN sh -c " \
         libc6-i386; \
     fi"
 RUN apt-get update \
-    && apt-get -y upgrade \
+    && apt-get -y dist-upgrade \
     && apt-get install -y --no-install-recommends \
        $CUSTOM_PACKAGES \
        acl \