diff --git a/28/apache/Dockerfile b/28/apache/Dockerfile
index 9ac2e524..f9637bd7 100644
--- a/28/apache/Dockerfile
+++ b/28/apache/Dockerfile
@@ -65,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.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/28/fpm-alpine/Dockerfile b/28/fpm-alpine/Dockerfile
index 02ab2450..24f4d938 100644
--- a/28/fpm-alpine/Dockerfile
+++ b/28/fpm-alpine/Dockerfile
@@ -63,7 +63,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.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/28/fpm/Dockerfile b/28/fpm/Dockerfile
index 17432c85..4a8da235 100644
--- a/28/fpm/Dockerfile
+++ b/28/fpm/Dockerfile
@@ -65,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.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/29/apache/Dockerfile b/29/apache/Dockerfile
index 371d4cd7..a81658c2 100644
--- a/29/apache/Dockerfile
+++ b/29/apache/Dockerfile
@@ -65,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.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/29/fpm-alpine/Dockerfile b/29/fpm-alpine/Dockerfile
index 5e8aa0f8..017de203 100644
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@@ -63,7 +63,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.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/29/fpm/Dockerfile b/29/fpm/Dockerfile
index a134d720..00776307 100644
--- a/29/fpm/Dockerfile
+++ b/29/fpm/Dockerfile
@@ -65,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.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile
index 93642f7b..907fc57e 100644
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@@ -65,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.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile
index 11c6e1ba..a8b5faa6 100644
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@@ -63,7 +63,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.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile
index e9a09f6a..e2a52ed2 100644
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@@ -65,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.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index de69eef2..28defa93 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -88,11 +88,12 @@ RUN set -ex; \
 # see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
 ENV PHP_MEMORY_LIMIT 512M
 ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_OPCACHE_MEMORY_CONSUMTION 128
 RUN { \
         echo 'opcache.enable=1'; \
         echo 'opcache.interned_strings_buffer=32'; \
         echo 'opcache.max_accelerated_files=10000'; \
-        echo 'opcache.memory_consumption=128'; \
+        echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMTION}'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
         echo 'opcache.jit=1255'; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 8b66dd34..e8d5b080 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -20,6 +20,7 @@ RUN set -ex; \
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
 ENV PHP_MEMORY_LIMIT 512M
 ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_OPCACHE_MEMORY_CONSUMTION 128
 RUN set -ex; \
     \
     savedAptMark="$(apt-mark showmanual)"; \
@@ -97,7 +98,7 @@ RUN { \
         echo 'opcache.enable=1'; \
         echo 'opcache.interned_strings_buffer=32'; \
         echo 'opcache.max_accelerated_files=10000'; \
-        echo 'opcache.memory_consumption=128'; \
+        echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMTION}'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
         echo 'opcache.jit=1255'; \