diff --git a/images/5.2/php/common.sh b/images/5.2/php/common.sh
index bc62f214..b0df5979 100644
--- a/images/5.2/php/common.sh
+++ b/images/5.2/php/common.sh
@@ -1,42 +1,18 @@
 #!/bin/bash
 set -e
 
-# Check if an extension is available
-extension_available() {
-	local ext=$1
-	if [ -f "/usr/local/lib/php/extensions/$(php -r 'echo PHP_EXTENSION_DIR;' | xargs basename)/${ext}.so" ]; then
-		return 0
-	fi
-	return 1
-}
-
 # If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
 if [ "$LOCAL_PHP_XDEBUG" = true ]; then
-	if extension_available "xdebug"; then
-		docker-php-ext-enable xdebug
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-	else
-		echo "Warning: xdebug extension not available, skipping..."
-	fi
+	docker-php-ext-enable xdebug
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 else
-	if extension_available "opcache"; then
-		docker-php-ext-enable opcache
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-	else
-		# OPcache might be built-in, check if it's already loaded
-		if ! php -m | grep -q "Zend OPcache"; then
-			echo "Warning: opcache extension not available, skipping..."
-		fi
-	fi
+	docker-php-ext-enable opcache
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 fi
 
 # If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
 if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
-	if extension_available "memcached"; then
-		docker-php-ext-enable memcached
-	else
-		echo "Warning: memcached extension not available, skipping..."
-	fi
+	docker-php-ext-enable memcached
 else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
diff --git a/images/5.3/cli/Dockerfile b/images/5.3/cli/Dockerfile
index e363544c..4c36441a 100644
--- a/images/5.3/cli/Dockerfile
+++ b/images/5.3/cli/Dockerfile
@@ -32,9 +32,6 @@ COPY entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh
 
-# WP CLI config
-ENV WP_CLI_CACHE_DIR=/tmp/wp-cli
-
 ENTRYPOINT [ "/entrypoint.sh" ]
 
 
diff --git a/images/5.3/php/common.sh b/images/5.3/php/common.sh
index bc62f214..b0df5979 100644
--- a/images/5.3/php/common.sh
+++ b/images/5.3/php/common.sh
@@ -1,42 +1,18 @@
 #!/bin/bash
 set -e
 
-# Check if an extension is available
-extension_available() {
-	local ext=$1
-	if [ -f "/usr/local/lib/php/extensions/$(php -r 'echo PHP_EXTENSION_DIR;' | xargs basename)/${ext}.so" ]; then
-		return 0
-	fi
-	return 1
-}
-
 # If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
 if [ "$LOCAL_PHP_XDEBUG" = true ]; then
-	if extension_available "xdebug"; then
-		docker-php-ext-enable xdebug
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-	else
-		echo "Warning: xdebug extension not available, skipping..."
-	fi
+	docker-php-ext-enable xdebug
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 else
-	if extension_available "opcache"; then
-		docker-php-ext-enable opcache
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-	else
-		# OPcache might be built-in, check if it's already loaded
-		if ! php -m | grep -q "Zend OPcache"; then
-			echo "Warning: opcache extension not available, skipping..."
-		fi
-	fi
+	docker-php-ext-enable opcache
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 fi
 
 # If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
 if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
-	if extension_available "memcached"; then
-		docker-php-ext-enable memcached
-	else
-		echo "Warning: memcached extension not available, skipping..."
-	fi
+	docker-php-ext-enable memcached
 else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
diff --git a/images/5.4/cli/Dockerfile b/images/5.4/cli/Dockerfile
index 292b79a8..f9e421cc 100644
--- a/images/5.4/cli/Dockerfile
+++ b/images/5.4/cli/Dockerfile
@@ -32,9 +32,6 @@ COPY entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh
 
-# WP CLI config
-ENV WP_CLI_CACHE_DIR=/tmp/wp-cli
-
 ENTRYPOINT [ "/entrypoint.sh" ]
 
 
diff --git a/images/5.4/php/common.sh b/images/5.4/php/common.sh
index bc62f214..b0df5979 100644
--- a/images/5.4/php/common.sh
+++ b/images/5.4/php/common.sh
@@ -1,42 +1,18 @@
 #!/bin/bash
 set -e
 
-# Check if an extension is available
-extension_available() {
-	local ext=$1
-	if [ -f "/usr/local/lib/php/extensions/$(php -r 'echo PHP_EXTENSION_DIR;' | xargs basename)/${ext}.so" ]; then
-		return 0
-	fi
-	return 1
-}
-
 # If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
 if [ "$LOCAL_PHP_XDEBUG" = true ]; then
-	if extension_available "xdebug"; then
-		docker-php-ext-enable xdebug
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-	else
-		echo "Warning: xdebug extension not available, skipping..."
-	fi
+	docker-php-ext-enable xdebug
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 else
-	if extension_available "opcache"; then
-		docker-php-ext-enable opcache
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-	else
-		# OPcache might be built-in, check if it's already loaded
-		if ! php -m | grep -q "Zend OPcache"; then
-			echo "Warning: opcache extension not available, skipping..."
-		fi
-	fi
+	docker-php-ext-enable opcache
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 fi
 
 # If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
 if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
-	if extension_available "memcached"; then
-		docker-php-ext-enable memcached
-	else
-		echo "Warning: memcached extension not available, skipping..."
-	fi
+	docker-php-ext-enable memcached
 else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
diff --git a/images/5.5/cli/Dockerfile b/images/5.5/cli/Dockerfile
index 90a56556..f69cc62a 100644
--- a/images/5.5/cli/Dockerfile
+++ b/images/5.5/cli/Dockerfile
@@ -32,9 +32,6 @@ COPY entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh
 
-# WP CLI config
-ENV WP_CLI_CACHE_DIR=/tmp/wp-cli
-
 ENTRYPOINT [ "/entrypoint.sh" ]
 
 
diff --git a/images/5.5/php/common.sh b/images/5.5/php/common.sh
index bc62f214..b0df5979 100644
--- a/images/5.5/php/common.sh
+++ b/images/5.5/php/common.sh
@@ -1,42 +1,18 @@
 #!/bin/bash
 set -e
 
-# Check if an extension is available
-extension_available() {
-	local ext=$1
-	if [ -f "/usr/local/lib/php/extensions/$(php -r 'echo PHP_EXTENSION_DIR;' | xargs basename)/${ext}.so" ]; then
-		return 0
-	fi
-	return 1
-}
-
 # If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
 if [ "$LOCAL_PHP_XDEBUG" = true ]; then
-	if extension_available "xdebug"; then
-		docker-php-ext-enable xdebug
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-	else
-		echo "Warning: xdebug extension not available, skipping..."
-	fi
+	docker-php-ext-enable xdebug
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 else
-	if extension_available "opcache"; then
-		docker-php-ext-enable opcache
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-	else
-		# OPcache might be built-in, check if it's already loaded
-		if ! php -m | grep -q "Zend OPcache"; then
-			echo "Warning: opcache extension not available, skipping..."
-		fi
-	fi
+	docker-php-ext-enable opcache
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 fi
 
 # If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
 if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
-	if extension_available "memcached"; then
-		docker-php-ext-enable memcached
-	else
-		echo "Warning: memcached extension not available, skipping..."
-	fi
+	docker-php-ext-enable memcached
 else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
diff --git a/images/5.6.20/cli/Dockerfile b/images/5.6.20/cli/Dockerfile
index dea54dee..0e989315 100644
--- a/images/5.6.20/cli/Dockerfile
+++ b/images/5.6.20/cli/Dockerfile
@@ -32,9 +32,6 @@ COPY entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh
 
-# WP CLI config
-ENV WP_CLI_CACHE_DIR=/tmp/wp-cli
-
 ENTRYPOINT [ "/entrypoint.sh" ]
 
 
diff --git a/images/5.6.20/php/common.sh b/images/5.6.20/php/common.sh
index bc62f214..b0df5979 100644
--- a/images/5.6.20/php/common.sh
+++ b/images/5.6.20/php/common.sh
@@ -1,42 +1,18 @@
 #!/bin/bash
 set -e
 
-# Check if an extension is available
-extension_available() {
-	local ext=$1
-	if [ -f "/usr/local/lib/php/extensions/$(php -r 'echo PHP_EXTENSION_DIR;' | xargs basename)/${ext}.so" ]; then
-		return 0
-	fi
-	return 1
-}
-
 # If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
 if [ "$LOCAL_PHP_XDEBUG" = true ]; then
-	if extension_available "xdebug"; then
-		docker-php-ext-enable xdebug
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-	else
-		echo "Warning: xdebug extension not available, skipping..."
-	fi
+	docker-php-ext-enable xdebug
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 else
-	if extension_available "opcache"; then
-		docker-php-ext-enable opcache
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-	else
-		# OPcache might be built-in, check if it's already loaded
-		if ! php -m | grep -q "Zend OPcache"; then
-			echo "Warning: opcache extension not available, skipping..."
-		fi
-	fi
+	docker-php-ext-enable opcache
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 fi
 
 # If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
 if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
-	if extension_available "memcached"; then
-		docker-php-ext-enable memcached
-	else
-		echo "Warning: memcached extension not available, skipping..."
-	fi
+	docker-php-ext-enable memcached
 else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
diff --git a/images/5.6/cli/Dockerfile b/images/5.6/cli/Dockerfile
index 957400a3..e7ce762d 100644
--- a/images/5.6/cli/Dockerfile
+++ b/images/5.6/cli/Dockerfile
@@ -32,9 +32,6 @@ COPY entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh
 
-# WP CLI config
-ENV WP_CLI_CACHE_DIR=/tmp/wp-cli
-
 ENTRYPOINT [ "/entrypoint.sh" ]
 
 
diff --git a/images/5.6/php/common.sh b/images/5.6/php/common.sh
index bc62f214..b0df5979 100644
--- a/images/5.6/php/common.sh
+++ b/images/5.6/php/common.sh
@@ -1,42 +1,18 @@
 #!/bin/bash
 set -e
 
-# Check if an extension is available
-extension_available() {
-	local ext=$1
-	if [ -f "/usr/local/lib/php/extensions/$(php -r 'echo PHP_EXTENSION_DIR;' | xargs basename)/${ext}.so" ]; then
-		return 0
-	fi
-	return 1
-}
-
 # If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
 if [ "$LOCAL_PHP_XDEBUG" = true ]; then
-	if extension_available "xdebug"; then
-		docker-php-ext-enable xdebug
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-	else
-		echo "Warning: xdebug extension not available, skipping..."
-	fi
+	docker-php-ext-enable xdebug
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 else
-	if extension_available "opcache"; then
-		docker-php-ext-enable opcache
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-	else
-		# OPcache might be built-in, check if it's already loaded
-		if ! php -m | grep -q "Zend OPcache"; then
-			echo "Warning: opcache extension not available, skipping..."
-		fi
-	fi
+	docker-php-ext-enable opcache
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 fi
 
 # If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
 if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
-	if extension_available "memcached"; then
-		docker-php-ext-enable memcached
-	else
-		echo "Warning: memcached extension not available, skipping..."
-	fi
+	docker-php-ext-enable memcached
 else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
diff --git a/images/7.0/cli/Dockerfile b/images/7.0/cli/Dockerfile
index 19194707..258ec2fc 100644
--- a/images/7.0/cli/Dockerfile
+++ b/images/7.0/cli/Dockerfile
@@ -32,9 +32,6 @@ COPY entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh
 
-# WP CLI config
-ENV WP_CLI_CACHE_DIR=/tmp/wp-cli
-
 ENTRYPOINT [ "/entrypoint.sh" ]
 
 
diff --git a/images/7.0/php/common.sh b/images/7.0/php/common.sh
index bc62f214..b0df5979 100644
--- a/images/7.0/php/common.sh
+++ b/images/7.0/php/common.sh
@@ -1,42 +1,18 @@
 #!/bin/bash
 set -e
 
-# Check if an extension is available
-extension_available() {
-	local ext=$1
-	if [ -f "/usr/local/lib/php/extensions/$(php -r 'echo PHP_EXTENSION_DIR;' | xargs basename)/${ext}.so" ]; then
-		return 0
-	fi
-	return 1
-}
-
 # If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
 if [ "$LOCAL_PHP_XDEBUG" = true ]; then
-	if extension_available "xdebug"; then
-		docker-php-ext-enable xdebug
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-	else
-		echo "Warning: xdebug extension not available, skipping..."
-	fi
+	docker-php-ext-enable xdebug
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 else
-	if extension_available "opcache"; then
-		docker-php-ext-enable opcache
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-	else
-		# OPcache might be built-in, check if it's already loaded
-		if ! php -m | grep -q "Zend OPcache"; then
-			echo "Warning: opcache extension not available, skipping..."
-		fi
-	fi
+	docker-php-ext-enable opcache
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 fi
 
 # If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
 if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
-	if extension_available "memcached"; then
-		docker-php-ext-enable memcached
-	else
-		echo "Warning: memcached extension not available, skipping..."
-	fi
+	docker-php-ext-enable memcached
 else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
diff --git a/images/7.1/cli/Dockerfile b/images/7.1/cli/Dockerfile
index 399895f6..ee76afc7 100644
--- a/images/7.1/cli/Dockerfile
+++ b/images/7.1/cli/Dockerfile
@@ -32,9 +32,6 @@ COPY entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh
 
-# WP CLI config
-ENV WP_CLI_CACHE_DIR=/tmp/wp-cli
-
 ENTRYPOINT [ "/entrypoint.sh" ]
 
 
diff --git a/images/7.1/php/common.sh b/images/7.1/php/common.sh
index bc62f214..b0df5979 100644
--- a/images/7.1/php/common.sh
+++ b/images/7.1/php/common.sh
@@ -1,42 +1,18 @@
 #!/bin/bash
 set -e
 
-# Check if an extension is available
-extension_available() {
-	local ext=$1
-	if [ -f "/usr/local/lib/php/extensions/$(php -r 'echo PHP_EXTENSION_DIR;' | xargs basename)/${ext}.so" ]; then
-		return 0
-	fi
-	return 1
-}
-
 # If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
 if [ "$LOCAL_PHP_XDEBUG" = true ]; then
-	if extension_available "xdebug"; then
-		docker-php-ext-enable xdebug
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-	else
-		echo "Warning: xdebug extension not available, skipping..."
-	fi
+	docker-php-ext-enable xdebug
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 else
-	if extension_available "opcache"; then
-		docker-php-ext-enable opcache
-		rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-	else
-		# OPcache might be built-in, check if it's already loaded
-		if ! php -m | grep -q "Zend OPcache"; then
-			echo "Warning: opcache extension not available, skipping..."
-		fi
-	fi
+	docker-php-ext-enable opcache
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 fi
 
 # If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
 if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
-	if extension_available "memcached"; then
-		docker-php-ext-enable memcached
-	else
-		echo "Warning: memcached extension not available, skipping..."
-	fi
+	docker-php-ext-enable memcached
 else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
diff --git a/update.php b/update.php
index 09b01284..7c3fb00d 100644
--- a/update.php
+++ b/update.php
@@ -156,11 +156,12 @@
 );
 
 /**
- * An array of all legacy PHP versions that we need to generate images for, and their config settings.
+ * An array of all legacy PHP versions that images are no longer generated for, and their config settings.
  *
  * Each PHP version has settings for the PHP base image, the PHPUnit image, and the WP_CLI image.
  *
  * These versions of PHP have been unsupported for some time, and rarely need to be regenerated.
+ * This configuration is kept for historical purposes, and in case a regeneration is ever required.
  *
  * @see https://make.wordpress.org/core/handbook/references/php-compatibility-and-wordpress-versions/
  *
@@ -360,7 +361,7 @@
 );
 
 // Loop through each PHP version, and generate the Dockerfiles.
-foreach ( array_merge( $legacy_php_versions, $php_versions ) as $version => $images ) {
+foreach ( $php_versions as $version => $images ) {
 	$title = "| PHP $version |";
 	echo str_repeat( '-', strlen( $title ) ) . "\n";
 	echo "$title\n";