diff --git a/docker/photoprism/Dockerfile b/docker/photoprism/Dockerfile
index 4b1d60f52..b7d4f1885 100644
--- a/docker/photoprism/Dockerfile
+++ b/docker/photoprism/Dockerfile
@@ -35,12 +35,11 @@ RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80retry && \
 
 # install additional distribution packages
 RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \
+    ca-certificates \
     gpgv \
     wget \
     curl \
     make \
-    davfs2 \
-    ca-certificates \
     mariadb-client \
     sqlite3 \
     tzdata \
@@ -48,10 +47,6 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta
     libatomic1 \
     libheif-examples \
     librsvg2-bin \
-    gnupg \
-    gpg-agent \
-    apt-utils \
-    add-apt-key \
     exiftool \
     rawtherapee \
     ffmpeg \
diff --git a/docker/photoprism/armv7/Dockerfile b/docker/photoprism/armv7/Dockerfile
index f4b0af7c8..a498311c4 100644
--- a/docker/photoprism/armv7/Dockerfile
+++ b/docker/photoprism/armv7/Dockerfile
@@ -1,5 +1,5 @@
 ##################################################### BUILD STAGE ######################################################
-FROM photoprism/develop:armv7 as build
+FROM photoprism/develop:20220216-armv7 as build
 
 ARG TARGETARCH
 ARG TARGETPLATFORM
@@ -35,12 +35,11 @@ RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80retry && \
 
 # install additional distribution packages
 RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \
+    ca-certificates \
     gpgv \
     wget \
     curl \
     make \
-    davfs2 \
-    ca-certificates \
     mariadb-client \
     sqlite3 \
     tzdata \
@@ -48,10 +47,6 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta
     libatomic1 \
     libheif-examples \
     librsvg2-bin \
-    gnupg \
-    gpg-agent \
-    apt-utils \
-    add-apt-key \
     exiftool \
     rawtherapee \
     ffmpeg \
diff --git a/docker/photoprism/bullseye/Dockerfile b/docker/photoprism/bullseye/Dockerfile
index 734b10a82..6ca7bf7b7 100644
--- a/docker/photoprism/bullseye/Dockerfile
+++ b/docker/photoprism/bullseye/Dockerfile
@@ -38,12 +38,11 @@ COPY --chown=root:root --chmod=644 /docker/develop/bullseye/backports.list /etc/
 
 # install additional distribution packages
 RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \
+    ca-certificates \
     gpgv \
     wget \
     curl \
     make \
-    davfs2 \
-    ca-certificates \
     mariadb-client \
     sqlite3 \
     tzdata \
@@ -51,10 +50,6 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta
     libatomic1 \
     libheif-examples \
     librsvg2-bin \
-    gnupg \
-    gpg-agent \
-    apt-utils \
-    add-apt-key \
     exiftool \
     rawtherapee \
     ffmpeg \
diff --git a/docker/photoprism/buster/Dockerfile b/docker/photoprism/buster/Dockerfile
index 65b528e52..9491815a4 100644
--- a/docker/photoprism/buster/Dockerfile
+++ b/docker/photoprism/buster/Dockerfile
@@ -38,12 +38,12 @@ COPY --chown=root:root --chmod=644 /docker/develop/buster/backports.list /etc/ap
 
 # install additional distribution packages
 RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \
+    ca-certificates \
     gpgv \
     wget \
     curl \
     make \
     davfs2 \
-    ca-certificates \
     mariadb-client \
     sqlite3 \
     tzdata \
@@ -51,10 +51,6 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta
     libatomic1 \
     libheif-examples \
     librsvg2-bin \
-    gnupg \
-    gpg-agent \
-    apt-utils \
-    add-apt-key \
     exiftool \
     rawtherapee \
     ffmpeg \
diff --git a/docker/scripts/Makefile b/docker/scripts/Makefile
index f1316377b..f1bdb7408 100644
--- a/docker/scripts/Makefile
+++ b/docker/scripts/Makefile
@@ -1,7 +1,7 @@
 # INSTALLS OPTIONAL PACKAGES AND DRIVERS IN DOCKER IMAGES
 # Maintainer: Michael Mayer <hello@photoprism.app>
 
-.PHONY: apt-upgrade apt-cleanup install-updates install-intel-graphics intel-graphics \
+.PHONY: apt-upgrade apt-cleanup install-davfs install-updates install-intel-graphics intel-graphics \
 		tensorflow-amd64-cpu tensorflow-amd64-cpu-install \
 		tensorflow-amd64-avx tensorflow-amd64-avx-install \
 		tensorflow-amd64-avx2 tensorflow-amd64-avx2-install;
@@ -16,6 +16,8 @@ apt-upgrade:
 	apt-get -y dist-upgrade
 apt-cleanup:
 	apt-get -y autoremove && apt-get -y autoclean && apt-get -y clean && rm -rf /var/lib/apt/lists/*
+install-davfs:
+	apt-get -y install davfs2
 install-intel-graphics:
 	apt-get -y install intel-opencl-icd intel-media-va-driver-non-free i965-va-driver-shaders libmfx1
 /tmp/libtensorflow-linux-cpu-1.15.2.tar.gz: