diff --git a/8.0/alpine3.16/fpm/Dockerfile b/8.0/alpine3.16/fpm/Dockerfile
index aa40bf88d5..a436028c4f 100644
--- a/8.0/alpine3.16/fpm/Dockerfile
+++ b/8.0/alpine3.16/fpm/Dockerfile
@@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.0/bullseye/fpm/Dockerfile b/8.0/bullseye/fpm/Dockerfile
index 3027591328..f1f72941df 100644
--- a/8.0/bullseye/fpm/Dockerfile
+++ b/8.0/bullseye/fpm/Dockerfile
@@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.0/buster/fpm/Dockerfile b/8.0/buster/fpm/Dockerfile
index 9247f9407a..718f60a2db 100644
--- a/8.0/buster/fpm/Dockerfile
+++ b/8.0/buster/fpm/Dockerfile
@@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.1/alpine3.16/fpm/Dockerfile b/8.1/alpine3.16/fpm/Dockerfile
index 773abd8037..9a394a685d 100644
--- a/8.1/alpine3.16/fpm/Dockerfile
+++ b/8.1/alpine3.16/fpm/Dockerfile
@@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.1/alpine3.17/fpm/Dockerfile b/8.1/alpine3.17/fpm/Dockerfile
index 4f5b10c87f..2aa6bb0a1f 100644
--- a/8.1/alpine3.17/fpm/Dockerfile
+++ b/8.1/alpine3.17/fpm/Dockerfile
@@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.1/alpine3.18/fpm/Dockerfile b/8.1/alpine3.18/fpm/Dockerfile
index 8e36343eef..12d7ce21a7 100644
--- a/8.1/alpine3.18/fpm/Dockerfile
+++ b/8.1/alpine3.18/fpm/Dockerfile
@@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.1/bookworm/fpm/Dockerfile b/8.1/bookworm/fpm/Dockerfile
index 36f9e9c577..2c991a38dd 100644
--- a/8.1/bookworm/fpm/Dockerfile
+++ b/8.1/bookworm/fpm/Dockerfile
@@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.1/bullseye/fpm/Dockerfile b/8.1/bullseye/fpm/Dockerfile
index 281449456f..4f3fd39fa4 100644
--- a/8.1/bullseye/fpm/Dockerfile
+++ b/8.1/bullseye/fpm/Dockerfile
@@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.2/alpine3.17/fpm/Dockerfile b/8.2/alpine3.17/fpm/Dockerfile
index 9155592a64..ef814c1b4f 100644
--- a/8.2/alpine3.17/fpm/Dockerfile
+++ b/8.2/alpine3.17/fpm/Dockerfile
@@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.2/alpine3.18/fpm/Dockerfile b/8.2/alpine3.18/fpm/Dockerfile
index 93f9a85227..2603cf3ed7 100644
--- a/8.2/alpine3.18/fpm/Dockerfile
+++ b/8.2/alpine3.18/fpm/Dockerfile
@@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.2/bookworm/fpm/Dockerfile b/8.2/bookworm/fpm/Dockerfile
index ddf46246e0..4da55b75c4 100644
--- a/8.2/bookworm/fpm/Dockerfile
+++ b/8.2/bookworm/fpm/Dockerfile
@@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.2/bullseye/fpm/Dockerfile b/8.2/bullseye/fpm/Dockerfile
index c0114ea11e..a72e33e8d4 100644
--- a/8.2/bullseye/fpm/Dockerfile
+++ b/8.2/bullseye/fpm/Dockerfile
@@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.3/alpine3.17/fpm/Dockerfile b/8.3/alpine3.17/fpm/Dockerfile
index 6a2e6564d4..94173f63a9 100644
--- a/8.3/alpine3.17/fpm/Dockerfile
+++ b/8.3/alpine3.17/fpm/Dockerfile
@@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.3/alpine3.18/fpm/Dockerfile b/8.3/alpine3.18/fpm/Dockerfile
index 570216c233..6c6f12e3ae 100644
--- a/8.3/alpine3.18/fpm/Dockerfile
+++ b/8.3/alpine3.18/fpm/Dockerfile
@@ -209,6 +209,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.3/bookworm/fpm/Dockerfile b/8.3/bookworm/fpm/Dockerfile
index 50c88e31d3..c5666ecfef 100644
--- a/8.3/bookworm/fpm/Dockerfile
+++ b/8.3/bookworm/fpm/Dockerfile
@@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/8.3/bullseye/fpm/Dockerfile b/8.3/bullseye/fpm/Dockerfile
index fc31be75cb..8142b206b9 100644
--- a/8.3/bullseye/fpm/Dockerfile
+++ b/8.3/bullseye/fpm/Dockerfile
@@ -224,6 +224,7 @@ RUN docker-php-ext-enable sodium
 
 ENTRYPOINT ["docker-php-entrypoint"]
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index 17fc812ad1..33b0bf7946 100644
--- a/Dockerfile-linux.template
+++ b/Dockerfile-linux.template
@@ -457,6 +457,7 @@ WORKDIR /var/www/html
 EXPOSE 80
 {{ ) elif env.variant == "fpm" then ( -}}
 WORKDIR /var/www/html
+ENV PHP_FPM_DIR /usr/local/etc/php-fpm.d
 
 RUN set -eux; \
 	cd /usr/local/etc; \