diff --git a/.examples/README.md b/.examples/README.md
index 6358bc34..b505b3ac 100644
--- a/.examples/README.md
+++ b/.examples/README.md
@@ -18,6 +18,9 @@ Example | Description
 [smb](https://github.com/nextcloud/docker/tree/master/.examples/dockerfiles/smb) | adds dependencies required to use smb shares
 [full](https://github.com/nextcloud/docker/tree/master/.examples/dockerfiles/full) | adds dependencies for ALL optional packages and cron functionality via supervisor (as in the `cron` example Dockerfile).
 
+### cron
+NOTE: [this container must run as root or `cron.php` will not run](https://github.com/nextcloud/docker/issues/1899).
+
 ### full
 The `full` Dockerfile example adds dependencies for all optional packages suggested by nextcloud that may be needed for some features (e.g. Video Preview Generation), as stated in the [Administration Manual](https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html).
 
diff --git a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
index d5e30393..facf6fd2 100644
--- a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   db:
     image: mariadb:10.5
-    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
     restart: always
     volumes:
       - db:/var/lib/mysql
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
index c3c94f39..1b9b3039 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   db:
     image: mariadb:10.5
-    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
     restart: always
     volumes:
       - db:/var/lib/mysql
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
index eaf18678..d88c9db4 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   db:
     image: mariadb:10.5
-    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
     restart: always
     volumes:
       - db:/var/lib/mysql
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
index 80088993..c4e6fec3 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   db:
     image: mariadb:10.5
-    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
     restart: always
     volumes:
       - db:/var/lib/mysql
diff --git a/.examples/dockerfiles/full/apache/Dockerfile b/.examples/dockerfiles/full/apache/Dockerfile
index 27a10f86..179307cc 100644
--- a/.examples/dockerfiles/full/apache/Dockerfile
+++ b/.examples/dockerfiles/full/apache/Dockerfile
@@ -5,6 +5,7 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         ffmpeg \
+        ghostscript \
         libmagickcore-6.q16-6-extra \
         procps \
         smbclient \
diff --git a/.examples/dockerfiles/full/fpm/Dockerfile b/.examples/dockerfiles/full/fpm/Dockerfile
index 76f16b5c..218f63bd 100644
--- a/.examples/dockerfiles/full/fpm/Dockerfile
+++ b/.examples/dockerfiles/full/fpm/Dockerfile
@@ -5,6 +5,7 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         ffmpeg \
+        ghostscript \
         libmagickcore-6.q16-6-extra \
         procps \
         smbclient \
diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
index 474e3a97..ae9762a6 100644
--- a/.github/workflows/images.yml
+++ b/.github/workflows/images.yml
@@ -20,15 +20,15 @@ jobs:
     outputs:
       strategy: ${{ steps.generate-jobs.outputs.strategy }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - uses: docker-library/bashbrew@v0.1.5
       - id: generate-jobs
         name: Generate Jobs
         run: |
-          git clone --depth 1 https://github.com/docker-library/bashbrew.git -b master ~/bashbrew
-          strategy="$(GITHUB_REPOSITORY=nextcloud ~/bashbrew/scripts/github-actions/generate.sh)"
-          strategy="$(~/bashbrew/scripts/github-actions/munge-i386.sh -c <<<"$strategy")"
+          strategy="$(GITHUB_REPOSITORY=nextcloud "$BASHBREW_SCRIPTS/github-actions/generate.sh")"
+          strategy="$("$BASHBREW_SCRIPTS/github-actions/munge-i386.sh" -c <<<"$strategy")"
+          echo "strategy=$strategy" >> "$GITHUB_OUTPUT"
           jq . <<<"$strategy" # sanity check / debugging aid
-          echo "::set-output name=strategy::$strategy"
 
   test:
     needs: init
@@ -36,7 +36,7 @@ jobs:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Prepare Environment
         run: ${{ matrix.runs.prepare }}
       - name: Run update.sh script
diff --git a/.github/workflows/update-sh.yml b/.github/workflows/update-sh.yml
index b9b79170..4e03239a 100644
--- a/.github/workflows/update-sh.yml
+++ b/.github/workflows/update-sh.yml
@@ -13,7 +13,7 @@ jobs:
     name: Run update.sh script
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Run update.sh script
       run: ./update.sh
     - name: Commit files
diff --git a/23/apache/Dockerfile b/23/apache/Dockerfile
index eb774dc3..d1a7e28a 100644
--- a/23/apache/Dockerfile
+++ b/23/apache/Dockerfile
@@ -98,6 +98,8 @@ RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.jit=1255'; \
+        echo 'opcache.jit_buffer_size=128M'; \
     } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
     \
     echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -123,7 +125,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 23.0.11
+ENV NEXTCLOUD_VERSION 23.0.12
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/23/apache/entrypoint.sh b/23/apache/entrypoint.sh
index cad78817..3175361f 100755
--- a/23/apache/entrypoint.sh
+++ b/23/apache/entrypoint.sh
@@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 group="${APACHE_RUN_GROUP:-www-data}"
 
                 # strip off any '#' symbol ('#1000' is valid syntax for Apache)
-                pound='#'
-                user="${user#$pound}"
-                group="${group#$pound}"
+                user="${user#'#'}"
+                group="${group#'#'}"
                 ;;
             *) # php-fpm
                 user='www-data'
@@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                             for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
                                 DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
                                 run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
-                                NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
+                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                             done
                         fi
                     else
diff --git a/23/fpm-alpine/Dockerfile b/23/fpm-alpine/Dockerfile
index 2c2757c8..28cd103a 100644
--- a/23/fpm-alpine/Dockerfile
+++ b/23/fpm-alpine/Dockerfile
@@ -86,6 +86,8 @@ RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.jit=1255'; \
+        echo 'opcache.jit_buffer_size=128M'; \
     } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
     \
     echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -103,7 +105,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 23.0.11
+ENV NEXTCLOUD_VERSION 23.0.12
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/23/fpm-alpine/entrypoint.sh b/23/fpm-alpine/entrypoint.sh
index cad78817..3175361f 100755
--- a/23/fpm-alpine/entrypoint.sh
+++ b/23/fpm-alpine/entrypoint.sh
@@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 group="${APACHE_RUN_GROUP:-www-data}"
 
                 # strip off any '#' symbol ('#1000' is valid syntax for Apache)
-                pound='#'
-                user="${user#$pound}"
-                group="${group#$pound}"
+                user="${user#'#'}"
+                group="${group#'#'}"
                 ;;
             *) # php-fpm
                 user='www-data'
@@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                             for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
                                 DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
                                 run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
-                                NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
+                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                             done
                         fi
                     else
diff --git a/23/fpm/Dockerfile b/23/fpm/Dockerfile
index 198da7e1..8822a209 100644
--- a/23/fpm/Dockerfile
+++ b/23/fpm/Dockerfile
@@ -98,6 +98,8 @@ RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.jit=1255'; \
+        echo 'opcache.jit_buffer_size=128M'; \
     } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
     \
     echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -115,7 +117,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 23.0.11
+ENV NEXTCLOUD_VERSION 23.0.12
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/23/fpm/entrypoint.sh b/23/fpm/entrypoint.sh
index cad78817..3175361f 100755
--- a/23/fpm/entrypoint.sh
+++ b/23/fpm/entrypoint.sh
@@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 group="${APACHE_RUN_GROUP:-www-data}"
 
                 # strip off any '#' symbol ('#1000' is valid syntax for Apache)
-                pound='#'
-                user="${user#$pound}"
-                group="${group#$pound}"
+                user="${user#'#'}"
+                group="${group#'#'}"
                 ;;
             *) # php-fpm
                 user='www-data'
@@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                             for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
                                 DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
                                 run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
-                                NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
+                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                             done
                         fi
                     else
diff --git a/24/apache/Dockerfile b/24/apache/Dockerfile
index b0a5fa2c..fb349264 100644
--- a/24/apache/Dockerfile
+++ b/24/apache/Dockerfile
@@ -98,6 +98,8 @@ RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.jit=1255'; \
+        echo 'opcache.jit_buffer_size=128M'; \
     } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
     \
     echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -123,7 +125,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 24.0.7
+ENV NEXTCLOUD_VERSION 24.0.10
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/24/apache/entrypoint.sh b/24/apache/entrypoint.sh
index cad78817..3175361f 100755
--- a/24/apache/entrypoint.sh
+++ b/24/apache/entrypoint.sh
@@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 group="${APACHE_RUN_GROUP:-www-data}"
 
                 # strip off any '#' symbol ('#1000' is valid syntax for Apache)
-                pound='#'
-                user="${user#$pound}"
-                group="${group#$pound}"
+                user="${user#'#'}"
+                group="${group#'#'}"
                 ;;
             *) # php-fpm
                 user='www-data'
@@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                             for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
                                 DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
                                 run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
-                                NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
+                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                             done
                         fi
                     else
diff --git a/24/fpm-alpine/Dockerfile b/24/fpm-alpine/Dockerfile
index 124e2891..dd187250 100644
--- a/24/fpm-alpine/Dockerfile
+++ b/24/fpm-alpine/Dockerfile
@@ -86,6 +86,8 @@ RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.jit=1255'; \
+        echo 'opcache.jit_buffer_size=128M'; \
     } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
     \
     echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -103,7 +105,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 24.0.7
+ENV NEXTCLOUD_VERSION 24.0.10
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/24/fpm-alpine/entrypoint.sh b/24/fpm-alpine/entrypoint.sh
index cad78817..3175361f 100755
--- a/24/fpm-alpine/entrypoint.sh
+++ b/24/fpm-alpine/entrypoint.sh
@@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 group="${APACHE_RUN_GROUP:-www-data}"
 
                 # strip off any '#' symbol ('#1000' is valid syntax for Apache)
-                pound='#'
-                user="${user#$pound}"
-                group="${group#$pound}"
+                user="${user#'#'}"
+                group="${group#'#'}"
                 ;;
             *) # php-fpm
                 user='www-data'
@@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                             for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
                                 DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
                                 run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
-                                NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
+                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                             done
                         fi
                     else
diff --git a/24/fpm/Dockerfile b/24/fpm/Dockerfile
index 01d50bfa..08a1680c 100644
--- a/24/fpm/Dockerfile
+++ b/24/fpm/Dockerfile
@@ -98,6 +98,8 @@ RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.jit=1255'; \
+        echo 'opcache.jit_buffer_size=128M'; \
     } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
     \
     echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -115,7 +117,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 24.0.7
+ENV NEXTCLOUD_VERSION 24.0.10
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/24/fpm/entrypoint.sh b/24/fpm/entrypoint.sh
index cad78817..3175361f 100755
--- a/24/fpm/entrypoint.sh
+++ b/24/fpm/entrypoint.sh
@@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 group="${APACHE_RUN_GROUP:-www-data}"
 
                 # strip off any '#' symbol ('#1000' is valid syntax for Apache)
-                pound='#'
-                user="${user#$pound}"
-                group="${group#$pound}"
+                user="${user#'#'}"
+                group="${group#'#'}"
                 ;;
             *) # php-fpm
                 user='www-data'
@@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                             for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
                                 DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
                                 run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
-                                NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
+                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                             done
                         fi
                     else
diff --git a/25/apache/Dockerfile b/25/apache/Dockerfile
index accae666..29170ec0 100644
--- a/25/apache/Dockerfile
+++ b/25/apache/Dockerfile
@@ -98,6 +98,8 @@ RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.jit=1255'; \
+        echo 'opcache.jit_buffer_size=128M'; \
     } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
     \
     echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -123,7 +125,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 25.0.1
+ENV NEXTCLOUD_VERSION 25.0.4
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/25/apache/entrypoint.sh b/25/apache/entrypoint.sh
index cad78817..3175361f 100755
--- a/25/apache/entrypoint.sh
+++ b/25/apache/entrypoint.sh
@@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 group="${APACHE_RUN_GROUP:-www-data}"
 
                 # strip off any '#' symbol ('#1000' is valid syntax for Apache)
-                pound='#'
-                user="${user#$pound}"
-                group="${group#$pound}"
+                user="${user#'#'}"
+                group="${group#'#'}"
                 ;;
             *) # php-fpm
                 user='www-data'
@@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                             for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
                                 DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
                                 run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
-                                NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
+                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                             done
                         fi
                     else
diff --git a/25/fpm-alpine/Dockerfile b/25/fpm-alpine/Dockerfile
index 1b068789..1dc04677 100644
--- a/25/fpm-alpine/Dockerfile
+++ b/25/fpm-alpine/Dockerfile
@@ -86,6 +86,8 @@ RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.jit=1255'; \
+        echo 'opcache.jit_buffer_size=128M'; \
     } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
     \
     echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -103,7 +105,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 25.0.1
+ENV NEXTCLOUD_VERSION 25.0.4
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/25/fpm-alpine/entrypoint.sh b/25/fpm-alpine/entrypoint.sh
index cad78817..3175361f 100755
--- a/25/fpm-alpine/entrypoint.sh
+++ b/25/fpm-alpine/entrypoint.sh
@@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 group="${APACHE_RUN_GROUP:-www-data}"
 
                 # strip off any '#' symbol ('#1000' is valid syntax for Apache)
-                pound='#'
-                user="${user#$pound}"
-                group="${group#$pound}"
+                user="${user#'#'}"
+                group="${group#'#'}"
                 ;;
             *) # php-fpm
                 user='www-data'
@@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                             for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
                                 DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
                                 run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
-                                NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
+                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                             done
                         fi
                     else
diff --git a/25/fpm/Dockerfile b/25/fpm/Dockerfile
index 34a7a1ab..0e359e43 100644
--- a/25/fpm/Dockerfile
+++ b/25/fpm/Dockerfile
@@ -98,6 +98,8 @@ RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.jit=1255'; \
+        echo 'opcache.jit_buffer_size=128M'; \
     } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
     \
     echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -115,7 +117,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 25.0.1
+ENV NEXTCLOUD_VERSION 25.0.4
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/25/fpm/entrypoint.sh b/25/fpm/entrypoint.sh
index cad78817..3175361f 100755
--- a/25/fpm/entrypoint.sh
+++ b/25/fpm/entrypoint.sh
@@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 group="${APACHE_RUN_GROUP:-www-data}"
 
                 # strip off any '#' symbol ('#1000' is valid syntax for Apache)
-                pound='#'
-                user="${user#$pound}"
-                group="${group#$pound}"
+                user="${user#'#'}"
+                group="${group#'#'}"
                 ;;
             *) # php-fpm
                 user='www-data'
@@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                             for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
                                 DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
                                 run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
-                                NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
+                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                             done
                         fi
                     else
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 84d97395..c33b1971 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -85,6 +85,8 @@ RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.jit=1255'; \
+        echo 'opcache.jit_buffer_size=128M'; \
     } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
     \
     echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 4d2e6044..5427e2c2 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -99,6 +99,8 @@ RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.jit=1255'; \
+        echo 'opcache.jit_buffer_size=128M'; \
     } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
     \
     echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
diff --git a/README.md b/README.md
index 10c190ef..9c9c2b94 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@ A safe home for all your data. Access & share your files, calendars, contacts, m
 
 ![logo](https://cdn.rawgit.com/nextcloud/docker/80dd587d847b184ba95d7187a2a7a56ae4cbbb7b/logo.svg)
 
+This Docker micro-service image is developed and maintained by the Nextcloud community. Nextcloud GmbH does not offer support for this Docker image. When you are looking to get professional support, you can become an [enterprise](https://nextcloud.com/enterprise/) customer or use [AIO](https://github.com/nextcloud/all-in-one#nextcloud-all-in-one).
+
 # How to use this image
 This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from.
 
@@ -245,7 +247,7 @@ services:
   db:
     image: mariadb:10.5
     restart: always
-    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
     volumes:
       - db:/var/lib/mysql
     environment:
@@ -291,7 +293,7 @@ services:
   db:
     image: mariadb:10.5
     restart: always
-    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
     volumes:
       - db:/var/lib/mysql
     environment:
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index cad78817..3175361f 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 group="${APACHE_RUN_GROUP:-www-data}"
 
                 # strip off any '#' symbol ('#1000' is valid syntax for Apache)
-                pound='#'
-                user="${user#$pound}"
-                group="${group#$pound}"
+                user="${user#'#'}"
+                group="${group#'#'}"
                 ;;
             *) # php-fpm
                 user='www-data'
@@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                             for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
                                 DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
                                 run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
-                                NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
+                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                             done
                         fi
                     else
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 8c11204a..ee48c9c9 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-stable_channel='24.0.7'
+stable_channel='25.0.4'
 
 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
diff --git a/latest.txt b/latest.txt
index 9d0cd2ef..16a5a23a 100644
--- a/latest.txt
+++ b/latest.txt
@@ -1 +1 @@
-25.0.1
+25.0.4