diff --git a/10.2/php7.4/apache/Dockerfile b/10.2/php7.4/apache/Dockerfile
index 2dfe520..f037bdc 100644
--- a/10.2/php7.4/apache/Dockerfile
+++ b/10.2/php7.4/apache/Dockerfile
@@ -35,7 +35,6 @@ RUN set -ex; \
 		libjpeg-dev \
 		libldap2-dev \
 		libmemcached-dev \
-		libmagickwand-dev \
 		wkhtmltopdf \
 		libpq-dev \
 		libpng-dev \
diff --git a/10.2/php7.4/fpm/Dockerfile b/10.2/php7.4/fpm/Dockerfile
index c0a1a9d..eb99929 100644
--- a/10.2/php7.4/fpm/Dockerfile
+++ b/10.2/php7.4/fpm/Dockerfile
@@ -35,7 +35,6 @@ RUN set -ex; \
 		libjpeg-dev \
 		libldap2-dev \
 		libmemcached-dev \
-		libmagickwand-dev \
 		wkhtmltopdf \
 		libpq-dev \
 		libpng-dev \
diff --git a/10.2/php8.0/apache/Dockerfile b/10.2/php8.0/apache/Dockerfile
index ffd0ae9..641a4d5 100644
--- a/10.2/php8.0/apache/Dockerfile
+++ b/10.2/php8.0/apache/Dockerfile
@@ -35,7 +35,6 @@ RUN set -ex; \
 		libjpeg-dev \
 		libldap2-dev \
 		libmemcached-dev \
-		libmagickwand-dev \
 		wkhtmltopdf \
 		libpq-dev \
 		libpng-dev \
@@ -59,7 +58,6 @@ RUN set -ex; \
 		gd \
 		mbstring \
 		xml \
-		xmlrpc \
 		gmp \
 		intl \
 		ldap \
@@ -83,10 +81,12 @@ 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.21; \
 	pecl install memcached-3.2.0; \
+	pecl install xmlrpc-1.0.0; \
 	\
 	docker-php-ext-enable \
 		apcu \
 		memcached \
+		xmlrpc \
 	; \
 	rm -r /tmp/pear; \
 	\
diff --git a/10.2/php8.0/fpm/Dockerfile b/10.2/php8.0/fpm/Dockerfile
index 0328156..d041e78 100644
--- a/10.2/php8.0/fpm/Dockerfile
+++ b/10.2/php8.0/fpm/Dockerfile
@@ -35,7 +35,6 @@ RUN set -ex; \
 		libjpeg-dev \
 		libldap2-dev \
 		libmemcached-dev \
-		libmagickwand-dev \
 		wkhtmltopdf \
 		libpq-dev \
 		libpng-dev \
@@ -59,7 +58,6 @@ RUN set -ex; \
 		gd \
 		mbstring \
 		xml \
-		xmlrpc \
 		gmp \
 		intl \
 		ldap \
@@ -83,10 +81,12 @@ 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.21; \
 	pecl install memcached-3.2.0; \
+	pecl install xmlrpc-1.0.0; \
 	\
 	docker-php-ext-enable \
 		apcu \
 		memcached \
+		xmlrpc \
 	; \
 	rm -r /tmp/pear; \
 	\
diff --git a/Dockerfile.template b/Dockerfile.template
index 082f4ac..a639dc0 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -67,7 +67,6 @@ RUN set -ex; \
 		libjpeg-dev \
 		libldap2-dev \
 		libmemcached-dev \
-		libmagickwand-dev \
 		wkhtmltopdf \
 		libpq-dev \
 		libpng-dev \
@@ -96,7 +95,9 @@ RUN set -ex; \
 		gd \
 		mbstring \
 		xml \
+{{ if env.phpVersion == "7.4" then ( -}}
 		xmlrpc \
+{{ ) else "" end -}}
 		gmp \
 		intl \
 		ldap \
@@ -122,10 +123,16 @@ RUN set -ex; \
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-{{ env.pecl_APCu }}; \
 	pecl install memcached-{{ env.pecl_memcached }}; \
+{{ if env.phpVersion == "8.0" then ( -}}
+	pecl install xmlrpc-1.0.0; \
+{{ ) else "" end -}}
 	\
 	docker-php-ext-enable \
 		apcu \
 		memcached \
+{{ if env.phpVersion == "8.0" then ( -}}
+		xmlrpc \
+{{ ) else "" end -}}
 	; \
 	rm -r /tmp/pear; \
 	\
@@ -141,10 +148,16 @@ RUN set -ex; \
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-{{ env.pecl_APCu }}; \
 	pecl install memcached-{{ env.pecl_memcached }}; \
+{{ if env.phpVersion == "8.0" then ( -}}
+	pecl install xmlrpc-1.0.0; \
+{{ ) else "" end -}}
 	\
 	docker-php-ext-enable \
 		apcu \
 		memcached \
+{{ if env.phpVersion == "8.0" then ( -}}
+		xmlrpc \
+{{ ) else "" end -}}
 	; \
 	rm -r /tmp/pear; \
 	\
diff --git a/apply-templates.sh b/apply-templates.sh
index 80997de..4df3617 100755
--- a/apply-templates.sh
+++ b/apply-templates.sh
@@ -64,12 +64,6 @@ for version; do
     # get the memcached values
     pecl_memcached="$(echo "${peclValues}" | jq -r '.memcached')"
     export pecl_memcached
-    # get the redis values
-    pecl_redis="$(echo "${peclValues}" | jq -r '.redis')"
-    export pecl_redis
-    # get the mcrypt values
-    pecl_mcrypt="$(echo "${peclValues}" | jq -r '.mcrypt')"
-    export pecl_mcrypt
 
     for variant in "${variants[@]}"; do
       export variant