diff --git a/2024.12/apache/Dockerfile b/2024.12/apache/Dockerfile
index 3ef683c..7e672af 100644
--- a/2024.12/apache/Dockerfile
+++ b/2024.12/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; \
@@ -13,7 +13,7 @@ RUN set -ex; \
         tini \
     ;
 
-ENV GOSU_VERSION 1.17
+ENV GOSU_VERSION=1.17
 RUN set -eux; \
 # save list of currently installed packages for later so we can clean up
 	savedAptMark="$(apt-mark showmanual)"; \
@@ -72,7 +72,7 @@ RUN set -ex; \
         libzip-dev \
         libldap2-dev \
         libgmp-dev \
-        libmagickcore-6.q16-6-extra \
+        libmagickcore-7.q16-10-extra \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -127,8 +127,8 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*
 
 # set recommended PHP.ini settings
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_MEMORY_LIMIT=512M
+ENV PHP_UPLOAD_LIMIT=512M
 RUN set -ex; \
     { \
         echo 'opcache.enable=1' ; \
@@ -173,9 +173,9 @@ VOLUME /var/www/html
 VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
-ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2024.12"
-ENV FRIENDICA_ADDONS "2024.12"
+ENV FRIENDICA_SYSLOG_FLAGS=39
+ENV FRIENDICA_VERSION="2024.12"
+ENV FRIENDICA_ADDONS="2024.12"
 ENV FRIENDICA_DOWNLOAD_SHA256 "37bb0fad549c955fced70059b62cd4f3364e344363011a2d054f1b6c425cfb9e"
 ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "fbbece635dfaec9d2365581aaafb913cec00128e5815087c9d9b8a46d8dc7ed5"
 
diff --git a/2024.12/fpm-alpine/Dockerfile b/2024.12/fpm-alpine/Dockerfile
index f0b0d23..85db5ef 100644
--- a/2024.12/fpm-alpine/Dockerfile
+++ b/2024.12/fpm-alpine/Dockerfile
@@ -11,7 +11,7 @@ RUN set -ex; \
         shadow \
         tini;
 
-ENV GOSU_VERSION 1.17
+ENV GOSU_VERSION=1.17
 RUN set -eux; \
 	\
 	apk add --no-cache --virtual .gosu-deps \
@@ -105,8 +105,8 @@ RUN set -ex; \
     apk del --no-network .build-deps;
 
 # set recommended PHP.ini settings
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_MEMORY_LIMIT=512M
+ENV PHP_UPLOAD_LIMIT=512M
 RUN set -ex; \
     { \
         echo 'opcache.enable=1' ; \
@@ -143,9 +143,9 @@ VOLUME /var/www/html
 VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
-ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2024.12"
-ENV FRIENDICA_ADDONS "2024.12"
+ENV FRIENDICA_SYSLOG_FLAGS=39
+ENV FRIENDICA_VERSION="2024.12"
+ENV FRIENDICA_ADDONS="2024.12"
 ENV FRIENDICA_DOWNLOAD_SHA256 "37bb0fad549c955fced70059b62cd4f3364e344363011a2d054f1b6c425cfb9e"
 ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "fbbece635dfaec9d2365581aaafb913cec00128e5815087c9d9b8a46d8dc7ed5"
 
diff --git a/2024.12/fpm/Dockerfile b/2024.12/fpm/Dockerfile
index d17f4e1..69e6b56 100644
--- a/2024.12/fpm/Dockerfile
+++ b/2024.12/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; \
@@ -13,7 +13,7 @@ RUN set -ex; \
         tini \
     ;
 
-ENV GOSU_VERSION 1.17
+ENV GOSU_VERSION=1.17
 RUN set -eux; \
 # save list of currently installed packages for later so we can clean up
 	savedAptMark="$(apt-mark showmanual)"; \
@@ -72,7 +72,7 @@ RUN set -ex; \
         libzip-dev \
         libldap2-dev \
         libgmp-dev \
-        libmagickcore-6.q16-6-extra \
+        libmagickcore-7.q16-10-extra \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -127,8 +127,8 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*
 
 # set recommended PHP.ini settings
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_MEMORY_LIMIT=512M
+ENV PHP_UPLOAD_LIMIT=512M
 RUN set -ex; \
     { \
         echo 'opcache.enable=1' ; \
@@ -165,9 +165,9 @@ VOLUME /var/www/html
 VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
-ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2024.12"
-ENV FRIENDICA_ADDONS "2024.12"
+ENV FRIENDICA_SYSLOG_FLAGS=39
+ENV FRIENDICA_VERSION="2024.12"
+ENV FRIENDICA_ADDONS="2024.12"
 ENV FRIENDICA_DOWNLOAD_SHA256 "37bb0fad549c955fced70059b62cd4f3364e344363011a2d054f1b6c425cfb9e"
 ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "fbbece635dfaec9d2365581aaafb913cec00128e5815087c9d9b8a46d8dc7ed5"
 
diff --git a/2025.02-dev/apache/Dockerfile b/2025.02-dev/apache/Dockerfile
index 6dbb6b9..6b9b626 100644
--- a/2025.02-dev/apache/Dockerfile
+++ b/2025.02-dev/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; \
@@ -13,7 +13,7 @@ RUN set -ex; \
         tini \
     ;
 
-ENV GOSU_VERSION 1.17
+ENV GOSU_VERSION=1.17
 RUN set -eux; \
 # save list of currently installed packages for later so we can clean up
 	savedAptMark="$(apt-mark showmanual)"; \
@@ -72,7 +72,7 @@ RUN set -ex; \
         libzip-dev \
         libldap2-dev \
         libgmp-dev \
-        libmagickcore-6.q16-6-extra \
+        libmagickcore-7.q16-10-extra \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -127,8 +127,8 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*
 
 # set recommended PHP.ini settings
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_MEMORY_LIMIT=512M
+ENV PHP_UPLOAD_LIMIT=512M
 RUN set -ex; \
     { \
         echo 'opcache.enable=1' ; \
@@ -173,9 +173,9 @@ VOLUME /var/www/html
 VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
-ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2025.02-dev"
-ENV FRIENDICA_ADDONS "2025.02-dev"
+ENV FRIENDICA_SYSLOG_FLAGS=39
+ENV FRIENDICA_VERSION="2025.02-dev"
+ENV FRIENDICA_ADDONS="2025.02-dev"
 
 
 RUN set -ex; \
diff --git a/2025.02-dev/fpm-alpine/Dockerfile b/2025.02-dev/fpm-alpine/Dockerfile
index 8c103f4..b8d79e8 100644
--- a/2025.02-dev/fpm-alpine/Dockerfile
+++ b/2025.02-dev/fpm-alpine/Dockerfile
@@ -11,7 +11,7 @@ RUN set -ex; \
         shadow \
         tini;
 
-ENV GOSU_VERSION 1.17
+ENV GOSU_VERSION=1.17
 RUN set -eux; \
 	\
 	apk add --no-cache --virtual .gosu-deps \
@@ -105,8 +105,8 @@ RUN set -ex; \
     apk del --no-network .build-deps;
 
 # set recommended PHP.ini settings
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_MEMORY_LIMIT=512M
+ENV PHP_UPLOAD_LIMIT=512M
 RUN set -ex; \
     { \
         echo 'opcache.enable=1' ; \
@@ -143,9 +143,9 @@ VOLUME /var/www/html
 VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
-ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2025.02-dev"
-ENV FRIENDICA_ADDONS "2025.02-dev"
+ENV FRIENDICA_SYSLOG_FLAGS=39
+ENV FRIENDICA_VERSION="2025.02-dev"
+ENV FRIENDICA_ADDONS="2025.02-dev"
 
 
 RUN set -ex; \
diff --git a/2025.02-dev/fpm/Dockerfile b/2025.02-dev/fpm/Dockerfile
index 625b316..6bb2c57 100644
--- a/2025.02-dev/fpm/Dockerfile
+++ b/2025.02-dev/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; \
@@ -13,7 +13,7 @@ RUN set -ex; \
         tini \
     ;
 
-ENV GOSU_VERSION 1.17
+ENV GOSU_VERSION=1.17
 RUN set -eux; \
 # save list of currently installed packages for later so we can clean up
 	savedAptMark="$(apt-mark showmanual)"; \
@@ -72,7 +72,7 @@ RUN set -ex; \
         libzip-dev \
         libldap2-dev \
         libgmp-dev \
-        libmagickcore-6.q16-6-extra \
+        libmagickcore-7.q16-10-extra \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -127,8 +127,8 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*
 
 # set recommended PHP.ini settings
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_MEMORY_LIMIT=512M
+ENV PHP_UPLOAD_LIMIT=512M
 RUN set -ex; \
     { \
         echo 'opcache.enable=1' ; \
@@ -165,9 +165,9 @@ VOLUME /var/www/html
 VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
-ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2025.02-dev"
-ENV FRIENDICA_ADDONS "2025.02-dev"
+ENV FRIENDICA_SYSLOG_FLAGS=39
+ENV FRIENDICA_VERSION="2025.02-dev"
+ENV FRIENDICA_ADDONS="2025.02-dev"
 
 
 RUN set -ex; \
diff --git a/2025.07-rc/apache/Dockerfile b/2025.07-rc/apache/Dockerfile
index dbdefa9..417dab9 100644
--- a/2025.07-rc/apache/Dockerfile
+++ b/2025.07-rc/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; \
@@ -13,7 +13,7 @@ RUN set -ex; \
         tini \
     ;
 
-ENV GOSU_VERSION 1.17
+ENV GOSU_VERSION=1.17
 RUN set -eux; \
 # save list of currently installed packages for later so we can clean up
 	savedAptMark="$(apt-mark showmanual)"; \
@@ -72,7 +72,7 @@ RUN set -ex; \
         libzip-dev \
         libldap2-dev \
         libgmp-dev \
-        libmagickcore-6.q16-6-extra \
+        libmagickcore-7.q16-10-extra \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -127,8 +127,8 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*
 
 # set recommended PHP.ini settings
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_MEMORY_LIMIT=512M
+ENV PHP_UPLOAD_LIMIT=512M
 RUN set -ex; \
     { \
         echo 'opcache.enable=1' ; \
@@ -173,9 +173,9 @@ VOLUME /var/www/html
 VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
-ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2025.07-rc"
-ENV FRIENDICA_ADDONS "2025.07-rc"
+ENV FRIENDICA_SYSLOG_FLAGS=39
+ENV FRIENDICA_VERSION="2025.07-rc"
+ENV FRIENDICA_ADDONS="2025.07-rc"
 
 
 RUN set -ex; \
diff --git a/2025.07-rc/fpm-alpine/Dockerfile b/2025.07-rc/fpm-alpine/Dockerfile
index 5b200da..9fb0e16 100644
--- a/2025.07-rc/fpm-alpine/Dockerfile
+++ b/2025.07-rc/fpm-alpine/Dockerfile
@@ -11,7 +11,7 @@ RUN set -ex; \
         shadow \
         tini;
 
-ENV GOSU_VERSION 1.17
+ENV GOSU_VERSION=1.17
 RUN set -eux; \
 	\
 	apk add --no-cache --virtual .gosu-deps \
@@ -105,8 +105,8 @@ RUN set -ex; \
     apk del --no-network .build-deps;
 
 # set recommended PHP.ini settings
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_MEMORY_LIMIT=512M
+ENV PHP_UPLOAD_LIMIT=512M
 RUN set -ex; \
     { \
         echo 'opcache.enable=1' ; \
@@ -143,9 +143,9 @@ VOLUME /var/www/html
 VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
-ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2025.07-rc"
-ENV FRIENDICA_ADDONS "2025.07-rc"
+ENV FRIENDICA_SYSLOG_FLAGS=39
+ENV FRIENDICA_VERSION="2025.07-rc"
+ENV FRIENDICA_ADDONS="2025.07-rc"
 
 
 RUN set -ex; \
diff --git a/2025.07-rc/fpm/Dockerfile b/2025.07-rc/fpm/Dockerfile
index bef0d64..ecebf4e 100644
--- a/2025.07-rc/fpm/Dockerfile
+++ b/2025.07-rc/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; \
@@ -13,7 +13,7 @@ RUN set -ex; \
         tini \
     ;
 
-ENV GOSU_VERSION 1.17
+ENV GOSU_VERSION=1.17
 RUN set -eux; \
 # save list of currently installed packages for later so we can clean up
 	savedAptMark="$(apt-mark showmanual)"; \
@@ -72,7 +72,7 @@ RUN set -ex; \
         libzip-dev \
         libldap2-dev \
         libgmp-dev \
-        libmagickcore-6.q16-6-extra \
+        libmagickcore-7.q16-10-extra \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -127,8 +127,8 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*
 
 # set recommended PHP.ini settings
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_MEMORY_LIMIT=512M
+ENV PHP_UPLOAD_LIMIT=512M
 RUN set -ex; \
     { \
         echo 'opcache.enable=1' ; \
@@ -165,9 +165,9 @@ VOLUME /var/www/html
 VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
-ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2025.07-rc"
-ENV FRIENDICA_ADDONS "2025.07-rc"
+ENV FRIENDICA_SYSLOG_FLAGS=39
+ENV FRIENDICA_VERSION="2025.07-rc"
+ENV FRIENDICA_ADDONS="2025.07-rc"
 
 
 RUN set -ex; \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index f76cedd..10723cf 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -10,7 +10,7 @@ RUN set -ex; \
         shadow \
         tini;
 
-ENV GOSU_VERSION 1.17
+ENV GOSU_VERSION=1.17
 RUN set -eux; \
 	\
 	apk add --no-cache --virtual .gosu-deps \
@@ -104,8 +104,8 @@ RUN set -ex; \
     apk del --no-network .build-deps;
 
 # set recommended PHP.ini settings
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_MEMORY_LIMIT=512M
+ENV PHP_UPLOAD_LIMIT=512M
 RUN set -ex; \
     { \
         echo 'opcache.enable=1' ; \
@@ -141,9 +141,9 @@ VOLUME /var/www/html
 VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
-ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "%%VERSION%%"
-ENV FRIENDICA_ADDONS "%%VERSION%%"
+ENV FRIENDICA_SYSLOG_FLAGS=39
+ENV FRIENDICA_VERSION="%%VERSION%%"
+ENV FRIENDICA_ADDONS="%%VERSION%%"
 %%DOWNLOAD_SHA256%%
 
 %%INSTALL_EXTRAS%%
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 6249c23..7b35be6 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -1,4 +1,4 @@
-FROM php:%%PHP_VERSION%%-%%VARIANT%%-bookworm
+FROM php:%%PHP_VERSION%%-%%VARIANT%%-trixie
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -12,7 +12,7 @@ RUN set -ex; \
         tini \
     ;
 
-ENV GOSU_VERSION 1.17
+ENV GOSU_VERSION=1.17
 RUN set -eux; \
 # save list of currently installed packages for later so we can clean up
 	savedAptMark="$(apt-mark showmanual)"; \
@@ -71,7 +71,7 @@ RUN set -ex; \
         libzip-dev \
         libldap2-dev \
         libgmp-dev \
-        libmagickcore-6.q16-6-extra \
+        libmagickcore-7.q16-10-extra \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -126,8 +126,8 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*
 
 # set recommended PHP.ini settings
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_MEMORY_LIMIT=512M
+ENV PHP_UPLOAD_LIMIT=512M
 RUN set -ex; \
     { \
         echo 'opcache.enable=1' ; \
@@ -163,9 +163,9 @@ VOLUME /var/www/html
 VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
-ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "%%VERSION%%"
-ENV FRIENDICA_ADDONS "%%VERSION%%"
+ENV FRIENDICA_SYSLOG_FLAGS=39
+ENV FRIENDICA_VERSION="%%VERSION%%"
+ENV FRIENDICA_ADDONS="%%VERSION%%"
 %%DOWNLOAD_SHA256%%
 
 %%INSTALL_EXTRAS%%