diff --git a/31/apache/Dockerfile b/31/apache/Dockerfile
index b8e75079..e14072c3 100644
--- a/31/apache/Dockerfile
+++ b/31/apache/Dockerfile
@@ -67,10 +67,10 @@ RUN set -ex; \
     pecl install APCu-5.1.27; \
     pecl install igbinary-3.2.16; \
     pecl install imagick-3.8.0; \
-    pecl install memcached-3.4.0 \
-        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.3.0 \
-        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
+    pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
+        memcached-3.4.0; \
+    pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
+        redis-6.3.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/31/fpm-alpine/Dockerfile b/31/fpm-alpine/Dockerfile
index 61ff4b05..78869b4d 100644
--- a/31/fpm-alpine/Dockerfile
+++ b/31/fpm-alpine/Dockerfile
@@ -64,10 +64,10 @@ RUN set -ex; \
     pecl install APCu-5.1.27; \
     pecl install igbinary-3.2.16; \
     pecl install imagick-3.8.0; \
-    pecl install memcached-3.4.0 \
-        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.3.0 \
-        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
+    pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
+        memcached-3.4.0; \
+    pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
+        redis-6.3.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/31/fpm/Dockerfile b/31/fpm/Dockerfile
index b2792c98..ff15f4b8 100644
--- a/31/fpm/Dockerfile
+++ b/31/fpm/Dockerfile
@@ -67,10 +67,10 @@ RUN set -ex; \
     pecl install APCu-5.1.27; \
     pecl install igbinary-3.2.16; \
     pecl install imagick-3.8.0; \
-    pecl install memcached-3.4.0 \
-        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.3.0 \
-        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
+    pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
+        memcached-3.4.0; \
+    pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
+        redis-6.3.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/32/apache/Dockerfile b/32/apache/Dockerfile
index e78641b9..404d51a2 100644
--- a/32/apache/Dockerfile
+++ b/32/apache/Dockerfile
@@ -67,10 +67,10 @@ RUN set -ex; \
     pecl install APCu-5.1.27; \
     pecl install igbinary-3.2.16; \
     pecl install imagick-3.8.0; \
-    pecl install memcached-3.4.0 \
-        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.3.0 \
-        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
+    pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
+        memcached-3.4.0; \
+    pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
+        redis-6.3.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/32/fpm-alpine/Dockerfile b/32/fpm-alpine/Dockerfile
index 021d4704..56075448 100644
--- a/32/fpm-alpine/Dockerfile
+++ b/32/fpm-alpine/Dockerfile
@@ -64,10 +64,10 @@ RUN set -ex; \
     pecl install APCu-5.1.27; \
     pecl install igbinary-3.2.16; \
     pecl install imagick-3.8.0; \
-    pecl install memcached-3.4.0 \
-        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.3.0 \
-        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
+    pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
+        memcached-3.4.0; \
+    pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
+        redis-6.3.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/32/fpm/Dockerfile b/32/fpm/Dockerfile
index f26ea4ec..b1484f8d 100644
--- a/32/fpm/Dockerfile
+++ b/32/fpm/Dockerfile
@@ -67,10 +67,10 @@ RUN set -ex; \
     pecl install APCu-5.1.27; \
     pecl install igbinary-3.2.16; \
     pecl install imagick-3.8.0; \
-    pecl install memcached-3.4.0 \
-        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.3.0 \
-        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
+    pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
+        memcached-3.4.0; \
+    pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
+        redis-6.3.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index b2c6ea5e..a7238bb7 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -63,10 +63,10 @@ RUN set -ex; \
     pecl install APCu-%%APCU_VERSION%%; \
     pecl install igbinary-%%IGBINARY_VERSION%%; \
     pecl install imagick-%%IMAGICK_VERSION%%; \
-    pecl install memcached-%%MEMCACHED_VERSION%% \
-        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-%%REDIS_VERSION%% \
-        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
+    pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
+        memcached-%%MEMCACHED_VERSION%%; \
+    pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
+        redis-%%REDIS_VERSION%%; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 5c935d87..5d73daea 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -66,10 +66,10 @@ RUN set -ex; \
     pecl install APCu-%%APCU_VERSION%%; \
     pecl install igbinary-%%IGBINARY_VERSION%%; \
     pecl install imagick-%%IMAGICK_VERSION%%; \
-    pecl install memcached-%%MEMCACHED_VERSION%% \
-        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-%%REDIS_VERSION%% \
-        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
+    pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
+        memcached-%%MEMCACHED_VERSION%%; \
+    pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
+        redis-%%REDIS_VERSION%%; \
     \
     docker-php-ext-enable \
         apcu \