diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
index 6e0ad588..cb1d4fff 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
@@ -39,8 +39,10 @@ http {
 
     #gzip  on;
 
+    resolver 127.0.0.11 valid=2s;
     upstream php-handler {
-        server app:9000;
+        zone backends 64k;
+        server app:9000 resolve;
     }
 
     server {
diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
index 6e0ad588..cb1d4fff 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
@@ -39,8 +39,10 @@ http {
 
     #gzip  on;
 
+    resolver 127.0.0.11 valid=2s;
     upstream php-handler {
-        server app:9000;
+        zone backends 64k;
+        server app:9000 resolve;
     }
 
     server {
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
index a0db1a1c..ad2749cd 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
@@ -39,8 +39,10 @@ http {
 
     #gzip  on;
 
+    resolver 127.0.0.11 valid=2s;
     upstream php-handler {
-        server app:9000;
+        zone backends 64k;
+        server app:9000 resolve;
     }
 
     server {
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
index a0db1a1c..ad2749cd 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
@@ -39,8 +39,10 @@ http {
 
     #gzip  on;
 
+    resolver 127.0.0.11 valid=2s;
     upstream php-handler {
-        server app:9000;
+        zone backends 64k;
+        server app:9000 resolve;
     }
 
     server {
diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile
index 4dd63de1..845e1e75 100644
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.3-apache-bookworm
+FROM php:8.3-apache-trixie
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -9,10 +9,10 @@ RUN set -ex; \
         busybox-static \
         bzip2 \
         libldap-common \
-        libmagickcore-6.q16-6-extra \
+        libmagickcore-7.q16-10-extra \
         rsync \
     ; \
-    rm -rf /var/lib/apt/lists/*; \
+    apt-get dist-clean; \
     \
     mkdir -p /var/spool/cron/crontabs; \
     echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
@@ -57,7 +57,6 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
-        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
@@ -66,7 +65,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.24; \
+    pecl install APCu-5.1.26; \
     pecl install igbinary-3.2.16; \
     pecl install imagick-3.8.0; \
     pecl install memcached-3.3.0 \
@@ -89,13 +88,14 @@ RUN set -ex; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
         | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
         | sort -u \
-        | xargs -r dpkg-query --search \
-        | cut -d: -f1 \
+        | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+        | awk 'sub(":$", "", $1) { print $1 }' \
         | sort -u \
         | xargs -rt apt-mark manual; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
+    apt-get dist-clean
 
 # set recommended PHP.ini settings
 # see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
@@ -150,7 +150,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 30.0.13
+ENV NEXTCLOUD_VERSION 30.0.14
 
 RUN set -ex; \
     fetchDeps=" \
@@ -160,8 +160,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
@@ -175,7 +175,7 @@ RUN set -ex; \
     chmod +x /usr/src/nextcloud/occ; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
-    rm -rf /var/lib/apt/lists/*
+    apt-get dist-clean
 
 COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile
index 01240a0e..53dba22b 100644
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@@ -54,7 +54,6 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
-        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
@@ -63,7 +62,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.24; \
+    pecl install APCu-5.1.26; \
     pecl install igbinary-3.2.16; \
     pecl install imagick-3.8.0; \
     pecl install memcached-3.3.0 \
@@ -130,7 +129,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 30.0.13
+ENV NEXTCLOUD_VERSION 30.0.14
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -138,8 +137,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile
index 0f5bd55d..0a66b4e6 100644
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.3-fpm-bookworm
+FROM php:8.3-fpm-trixie
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -9,10 +9,10 @@ RUN set -ex; \
         busybox-static \
         bzip2 \
         libldap-common \
-        libmagickcore-6.q16-6-extra \
+        libmagickcore-7.q16-10-extra \
         rsync \
     ; \
-    rm -rf /var/lib/apt/lists/*; \
+    apt-get dist-clean; \
     \
     mkdir -p /var/spool/cron/crontabs; \
     echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
@@ -57,7 +57,6 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
-        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
@@ -66,7 +65,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.24; \
+    pecl install APCu-5.1.26; \
     pecl install igbinary-3.2.16; \
     pecl install imagick-3.8.0; \
     pecl install memcached-3.3.0 \
@@ -89,13 +88,14 @@ RUN set -ex; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
         | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
         | sort -u \
-        | xargs -r dpkg-query --search \
-        | cut -d: -f1 \
+        | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+        | awk 'sub(":$", "", $1) { print $1 }' \
         | sort -u \
         | xargs -rt apt-mark manual; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
+    apt-get dist-clean
 
 # set recommended PHP.ini settings
 # see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
@@ -135,7 +135,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 30.0.13
+ENV NEXTCLOUD_VERSION 30.0.14
 
 RUN set -ex; \
     fetchDeps=" \
@@ -145,8 +145,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
@@ -160,7 +160,7 @@ RUN set -ex; \
     chmod +x /usr/src/nextcloud/occ; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
-    rm -rf /var/lib/apt/lists/*
+    apt-get dist-clean
 
 COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
diff --git a/31/apache/Dockerfile b/31/apache/Dockerfile
index fff4647e..f559d096 100644
--- a/31/apache/Dockerfile
+++ b/31/apache/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.3-apache-bookworm
+FROM php:8.3-apache-trixie
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -9,10 +9,10 @@ RUN set -ex; \
         busybox-static \
         bzip2 \
         libldap-common \
-        libmagickcore-6.q16-6-extra \
+        libmagickcore-7.q16-10-extra \
         rsync \
     ; \
-    rm -rf /var/lib/apt/lists/*; \
+    apt-get dist-clean; \
     \
     mkdir -p /var/spool/cron/crontabs; \
     echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
@@ -57,7 +57,6 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
-        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
@@ -66,7 +65,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.24; \
+    pecl install APCu-5.1.26; \
     pecl install igbinary-3.2.16; \
     pecl install imagick-3.8.0; \
     pecl install memcached-3.3.0 \
@@ -89,13 +88,14 @@ RUN set -ex; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
         | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
         | sort -u \
-        | xargs -r dpkg-query --search \
-        | cut -d: -f1 \
+        | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+        | awk 'sub(":$", "", $1) { print $1 }' \
         | sort -u \
         | xargs -rt apt-mark manual; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
+    apt-get dist-clean
 
 # set recommended PHP.ini settings
 # see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
@@ -150,7 +150,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 31.0.7
+ENV NEXTCLOUD_VERSION 31.0.8
 
 RUN set -ex; \
     fetchDeps=" \
@@ -160,8 +160,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
@@ -175,7 +175,7 @@ RUN set -ex; \
     chmod +x /usr/src/nextcloud/occ; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
-    rm -rf /var/lib/apt/lists/*
+    apt-get dist-clean
 
 COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
diff --git a/31/fpm-alpine/Dockerfile b/31/fpm-alpine/Dockerfile
index e4486ff9..19b04260 100644
--- a/31/fpm-alpine/Dockerfile
+++ b/31/fpm-alpine/Dockerfile
@@ -54,7 +54,6 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
-        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
@@ -63,7 +62,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.24; \
+    pecl install APCu-5.1.26; \
     pecl install igbinary-3.2.16; \
     pecl install imagick-3.8.0; \
     pecl install memcached-3.3.0 \
@@ -130,7 +129,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 31.0.7
+ENV NEXTCLOUD_VERSION 31.0.8
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -138,8 +137,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/31/fpm/Dockerfile b/31/fpm/Dockerfile
index c83e2e17..78610bef 100644
--- a/31/fpm/Dockerfile
+++ b/31/fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.3-fpm-bookworm
+FROM php:8.3-fpm-trixie
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -9,10 +9,10 @@ RUN set -ex; \
         busybox-static \
         bzip2 \
         libldap-common \
-        libmagickcore-6.q16-6-extra \
+        libmagickcore-7.q16-10-extra \
         rsync \
     ; \
-    rm -rf /var/lib/apt/lists/*; \
+    apt-get dist-clean; \
     \
     mkdir -p /var/spool/cron/crontabs; \
     echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
@@ -57,7 +57,6 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
-        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
@@ -66,7 +65,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.24; \
+    pecl install APCu-5.1.26; \
     pecl install igbinary-3.2.16; \
     pecl install imagick-3.8.0; \
     pecl install memcached-3.3.0 \
@@ -89,13 +88,14 @@ RUN set -ex; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
         | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
         | sort -u \
-        | xargs -r dpkg-query --search \
-        | cut -d: -f1 \
+        | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+        | awk 'sub(":$", "", $1) { print $1 }' \
         | sort -u \
         | xargs -rt apt-mark manual; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
+    apt-get dist-clean
 
 # set recommended PHP.ini settings
 # see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
@@ -135,7 +135,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 31.0.7
+ENV NEXTCLOUD_VERSION 31.0.8
 
 RUN set -ex; \
     fetchDeps=" \
@@ -145,8 +145,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
@@ -160,7 +160,7 @@ RUN set -ex; \
     chmod +x /usr/src/nextcloud/occ; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
-    rm -rf /var/lib/apt/lists/*
+    apt-get dist-clean
 
 COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index cf6af0ff..60a82315 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -53,7 +53,6 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
-        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index cadae18a..cbbc7a0e 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -8,10 +8,10 @@ RUN set -ex; \
         busybox-static \
         bzip2 \
         libldap-common \
-        libmagickcore-6.q16-6-extra \
+        libmagickcore-7.q16-10-extra \
         rsync \
     ; \
-    rm -rf /var/lib/apt/lists/*; \
+    apt-get dist-clean; \
     \
     mkdir -p /var/spool/cron/crontabs; \
     echo '*/%%CRONTAB_INT%% * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
@@ -56,7 +56,6 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
-        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
@@ -88,13 +87,14 @@ RUN set -ex; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
         | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
         | sort -u \
-        | xargs -r dpkg-query --search \
-        | cut -d: -f1 \
+        | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+        | awk 'sub(":$", "", $1) { print $1 }' \
         | sort -u \
         | xargs -rt apt-mark manual; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
+    apt-get dist-clean
 
 # set recommended PHP.ini settings
 # see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
@@ -159,7 +159,7 @@ RUN set -ex; \
     chmod +x /usr/src/nextcloud/occ; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
-    rm -rf /var/lib/apt/lists/*
+    apt-get dist-clean
 
 COPY *.sh upgrade.exclude /
 COPY config/* /usr/src/nextcloud/config/
diff --git a/latest.txt b/latest.txt
index b9f889c4..121a4e3d 100644
--- a/latest.txt
+++ b/latest.txt
@@ -1 +1 @@
-31.0.7
+31.0.8
diff --git a/update.sh b/update.sh
index c7e4a2d4..c1d8478e 100755
--- a/update.sh
+++ b/update.sh
@@ -6,7 +6,7 @@ declare -A alpine_version=(
 )
 
 declare -A debian_version=(
-	[default]='bookworm'
+	[default]='trixie'
 )
 
 declare -A php_version=(
diff --git a/versions.json b/versions.json
index 12cb183a..f068d07a 100644
--- a/versions.json
+++ b/versions.json
@@ -1,20 +1,20 @@
 {
   "31": {
     "branch": "31",
-    "version": "31.0.7",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2.asc",
+    "version": "31.0.8",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2.asc",
     "variants": {
       "apache": {
         "variant": "apache",
         "base": "debian",
-        "baseVersion": "bookworm",
+        "baseVersion": "trixie",
         "phpVersion": "8.3"
       },
       "fpm": {
         "variant": "fpm",
         "base": "debian",
-        "baseVersion": "bookworm",
+        "baseVersion": "trixie",
         "phpVersion": "8.3"
       },
       "fpm-alpine": {
@@ -27,20 +27,20 @@
   },
   "30": {
     "branch": "30",
-    "version": "30.0.13",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2.asc",
+    "version": "30.0.14",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2.asc",
     "variants": {
       "apache": {
         "variant": "apache",
         "base": "debian",
-        "baseVersion": "bookworm",
+        "baseVersion": "trixie",
         "phpVersion": "8.3"
       },
       "fpm": {
         "variant": "fpm",
         "base": "debian",
-        "baseVersion": "bookworm",
+        "baseVersion": "trixie",
         "phpVersion": "8.3"
       },
       "fpm-alpine": {