diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index 1fb9b1e385..2bed3d018b 100644
--- a/Dockerfile-linux.template
+++ b/Dockerfile-linux.template
@@ -381,12 +381,13 @@ RUN set -eux; \
 {{ if env.variant == "apache" then ( -}}
 		\
 		--with-apxs2 \
-{{ ) elif env.variant == "fpm" then ( -}}
+{{ ) elif (env.variant == "fpm" or env.variant == "fpm-zts") then ( -}}
 		\
 		--enable-fpm \
 		--with-fpm-user=www-data \
 		--with-fpm-group=www-data \
-{{ ) elif env.variant == "zts" then ( -}}
+{{ ) else "" end -}}
+{{ if (env.variant == "zts" or env.variant == "fpm-zts") then ( -}}
 		\
 {{ if (.version | version_id) >= ("8" | version_id) then ( -}}
 		--enable-zts \
@@ -474,7 +475,7 @@ COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
 
 EXPOSE 80
-{{ ) elif env.variant == "fpm" then ( -}}
+{{ ) elif (env.variant == "fpm" or env.variant == "fpm-zts") then ( -}}
 WORKDIR /var/www/html
 
 RUN set -eux; \
diff --git a/apply-templates.sh b/apply-templates.sh
index a644fe5a62..f9f2ccdc72 100755
--- a/apply-templates.sh
+++ b/apply-templates.sh
@@ -56,6 +56,7 @@ for version; do
 		case "$variant" in
 			apache) cmd='["apache2-foreground"]' ;;
 			fpm) cmd='["php-fpm"]' ;;
+			fpm-zts) cmd='["php-fpm"]' ;;
 			*) cmd='["php", "-a"]' ;;
 		esac
 		export cmd
diff --git a/versions.sh b/versions.sh
index d22a7fcc8e..dedcaa4148 100755
--- a/versions.sh
+++ b/versions.sh
@@ -90,7 +90,7 @@ for version in "${versions[@]}"; do
 		alpine3.16 \
 		alpine3.15 \
 	; do
-		for variant in cli apache fpm zts; do
+		for variant in cli apache fpm fpm-zts zts; do
 			if [[ "$suite" = alpine* ]]; then
 				if [ "$variant" = 'apache' ]; then
 					continue