diff --git a/31/apache/Dockerfile b/31/apache/Dockerfile
index ca76fcc5e..1581d097a 100644
--- a/31/apache/Dockerfile
+++ b/31/apache/Dockerfile
@@ -40,6 +40,7 @@ RUN set -ex; \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
+        libavif-dev \
         libwebp-dev \
         libxml2-dev \
         libzip-dev \
@@ -47,7 +48,7 @@ RUN set -ex; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
     docker-php-ext-configure ftp --with-openssl-dir=/usr; \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
@@ -57,6 +58,7 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
+        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
diff --git a/31/fpm-alpine/Dockerfile b/31/fpm-alpine/Dockerfile
index beb82bf13..0dcf355bf 100644
--- a/31/fpm-alpine/Dockerfile
+++ b/31/fpm-alpine/Dockerfile
@@ -34,6 +34,7 @@ RUN set -ex; \
         libjpeg-turbo-dev \
         libmemcached-dev \
         libpng-dev \
+        libavif-dev
         libwebp-dev \
         libxml2-dev \
         libzip-dev \
@@ -43,7 +44,7 @@ RUN set -ex; \
     ; \
     \
     docker-php-ext-configure ftp --with-openssl-dir=/usr; \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
     docker-php-ext-configure ldap; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
@@ -53,6 +54,7 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
+        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
diff --git a/31/fpm/Dockerfile b/31/fpm/Dockerfile
index 55494ec44..39f14ee38 100644
--- a/31/fpm/Dockerfile
+++ b/31/fpm/Dockerfile
@@ -40,6 +40,7 @@ RUN set -ex; \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
+        libavif-dev \
         libwebp-dev \
         libxml2-dev \
         libzip-dev \
@@ -47,7 +48,7 @@ RUN set -ex; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
     docker-php-ext-configure ftp --with-openssl-dir=/usr; \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
@@ -57,6 +58,7 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
+        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
diff --git a/32/apache/Dockerfile b/32/apache/Dockerfile
index 4f003f561..a1f670910 100644
--- a/32/apache/Dockerfile
+++ b/32/apache/Dockerfile
@@ -40,6 +40,7 @@ RUN set -ex; \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
+        libavif-dev \
         libwebp-dev \
         libxml2-dev \
         libzip-dev \
@@ -47,7 +48,7 @@ RUN set -ex; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
     docker-php-ext-configure ftp --with-openssl-dir=/usr; \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
@@ -57,6 +58,7 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
+        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
diff --git a/32/fpm-alpine/Dockerfile b/32/fpm-alpine/Dockerfile
index 73d8db86f..50e084556 100644
--- a/32/fpm-alpine/Dockerfile
+++ b/32/fpm-alpine/Dockerfile
@@ -34,6 +34,7 @@ RUN set -ex; \
         libjpeg-turbo-dev \
         libmemcached-dev \
         libpng-dev \
+        libavif-dev
         libwebp-dev \
         libxml2-dev \
         libzip-dev \
@@ -43,7 +44,7 @@ RUN set -ex; \
     ; \
     \
     docker-php-ext-configure ftp --with-openssl-dir=/usr; \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
     docker-php-ext-configure ldap; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
@@ -53,6 +54,7 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
+        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
diff --git a/32/fpm/Dockerfile b/32/fpm/Dockerfile
index edbce905c..270206186 100644
--- a/32/fpm/Dockerfile
+++ b/32/fpm/Dockerfile
@@ -40,6 +40,7 @@ RUN set -ex; \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
+        libavif-dev \
         libwebp-dev \
         libxml2-dev \
         libzip-dev \
@@ -47,7 +48,7 @@ RUN set -ex; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
     docker-php-ext-configure ftp --with-openssl-dir=/usr; \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
@@ -57,6 +58,7 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
+        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index a7238bb74..1cc98cd3a 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -33,6 +33,7 @@ RUN set -ex; \
         libjpeg-turbo-dev \
         libmemcached-dev \
         libpng-dev \
+        libavif-dev
         libwebp-dev \
         libxml2-dev \
         libzip-dev \
@@ -41,8 +42,8 @@ RUN set -ex; \
         postgresql-dev \
     ; \
     \
-    docker-php-ext-configure ftp --with-openssl-dir=/usr; \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
+    docker-php-ext-configure ftp %%FTP_OPTIONS%%; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
     docker-php-ext-configure ldap; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
@@ -52,6 +53,7 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
+        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 10974d6dc..7316cbfdc 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -39,14 +39,15 @@ RUN set -ex; \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
+        libavif-dev \
         libwebp-dev \
         libxml2-dev \
         libzip-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-    docker-php-ext-configure ftp --with-openssl-dir=/usr; \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
+    docker-php-ext-configure ftp %%FTP_OPTIONS%%; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
@@ -56,6 +57,7 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
+        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
diff --git a/update.sh b/update.sh
index b1a403434..d6fc33ca4 100755
--- a/update.sh
+++ b/update.sh
@@ -11,6 +11,12 @@ declare -A debian_version=(
 
 declare -A php_version=(
 	[default]='8.3'
+	[33]='8.4'
+)
+
+declare -A ftp_options=(
+	[default]='--with-openssl-dir=/usr'
+	[8.4]='--with-ftp-ssl'
 )
 
 declare -A cmd=(
@@ -107,6 +113,7 @@ function create_variant() {
 	debianVersion=${debian_version[$version]-${debian_version[default]}}
 	phpVersion=${php_version[$version]-${php_version[default]}}
 	crontabInt=${crontab_int[$version]-${crontab_int[default]}}
+	ftp_options=${ftp_options[$phpVersion]-${ftp_options[default]}}
 	url="https://github.com/nextcloud-releases/server/releases/download/v$fullversion/nextcloud-$fullversion.tar.bz2"
 	ascUrl="https://github.com/nextcloud-releases/server/releases/download/v$fullversion/nextcloud-$fullversion.tar.bz2.asc"
 
@@ -132,6 +139,7 @@ function create_variant() {
 		s|%%VARIANT_EXTRAS%%|'"${extras[$variant]}"'|g;
 		s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g;
 		s/%%IGBINARY_VERSION%%/'"${pecl_versions[igbinary]}"'/g;
+		s|%%FTP_OPTIONS%%|'"$ftp_options"'|g;
 		s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
 		s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
 		s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;