diff --git a/Dockerfile.bullseye b/Dockerfile.bullseye
index 573c9ecd7a6234bc6b18521aa6b6457516ff3b3f..34293b8f1ebbe0193b4d88788288eace03851f22 100644
--- a/Dockerfile.bullseye
+++ b/Dockerfile.bullseye
@@ -1,12 +1,9 @@
 FROM debian:bullseye AS uffd-base
 
-COPY cccv-archive-key.gpg /etc/apt/trusted.gpg.d/
-COPY cccv-archive-bullseye.list /etc/apt/sources.list.d/
-
 RUN apt-get -qq update && \
     apt-get -qq dist-upgrade && \
     apt-get -qq install \
-        lsb-release openjdk-11-jre-headless curl \
+        lsb-release openjdk-11-jre-headless curl ca-certificates \
         sqlite3 locales-all git \
         python3 python3-venv python3-coverage python3-ldap3 python3-flask python3-flask-sqlalchemy python3-flask-migrate \
         python3-pip python3-qrcode python3-fido2 python3-oauthlib python3-flask-babel python3-pytest python3-all python3-pip \
@@ -14,6 +11,9 @@ RUN apt-get -qq update && \
     pip3 install pylint html5validator twine build --upgrade && \
     apt-get -qq clean
 
+COPY cccv-archive-key.gpg /etc/apt/trusted.gpg.d/
+COPY cccv-archive-bullseye.list /etc/apt/sources.list.d/
+
 FROM uffd-base AS openldap-base
 
 RUN apt-get -qq update && \
diff --git a/Dockerfile.buster b/Dockerfile.buster
index ad824c34d3b4e9f0cda41005ac43950bf4b3916c..5d212520b1f5617b16fb11cb05b852486b98f6ce 100644
--- a/Dockerfile.buster
+++ b/Dockerfile.buster
@@ -1,12 +1,9 @@
 FROM debian:buster AS uffd-base
 
-COPY cccv-archive-key.gpg /etc/apt/trusted.gpg.d/
-COPY cccv-archive-buster.list /etc/apt/sources.list.d/
-
 RUN apt-get -qq update && \
     apt-get -qq dist-upgrade && \
     apt-get -qq install \
-        lsb-release openjdk-11-jre-headless curl \
+        lsb-release openjdk-11-jre-headless curl ca-certificates \
         sqlite3 locales-all git \
         python3 python3-venv python3-coverage python3-ldap3 python3-flask python3-flask-sqlalchemy python3-flask-migrate \
         python3-pip python3-qrcode python3-fido2 python3-oauthlib python3-flask-babel python3-pytest python3-all python3-pip \
@@ -14,6 +11,9 @@ RUN apt-get -qq update && \
     pip3 install pylint html5validator twine build --upgrade && \
     apt-get -qq clean
 
+COPY cccv-archive-key.gpg /etc/apt/trusted.gpg.d/
+COPY cccv-archive-buster.list /etc/apt/sources.list.d/
+
 FROM uffd-base AS openldap-base
 
 RUN apt-get -qq update && \