diff --git a/8.6-rc/alpine3.23/cli/Dockerfile b/8.6-rc/alpine3.23/cli/Dockerfile
index ea2acf43f..5121e3556 100644
--- a/8.6-rc/alpine3.23/cli/Dockerfile
+++ b/8.6-rc/alpine3.23/cli/Dockerfile
@@ -139,10 +139,8 @@ RUN set -eux; \
 # https://github.com/docker-library/php/issues/439
 		--with-mhash \
 		\
-# https://github.com/docker-library/php/issues/822
-# https://github.com/php/php-src/pull/21067/changes#diff-4b9db5b77bcd56aa33b310dc44c8bc99c729c9abb195df2e98e6985b81289ae8R130
-		--enable-pic \
-		\
+# Forcing PIC also removes -fpie from executable objects, preventing local-exec TLS.
+# So do not --enable-pic
 # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
 		--enable-mysqlnd \
 # https://wiki.php.net/rfc/argon2_password_hash
diff --git a/8.6-rc/alpine3.23/fpm/Dockerfile b/8.6-rc/alpine3.23/fpm/Dockerfile
index 02d0018a1..6d5e02566 100644
--- a/8.6-rc/alpine3.23/fpm/Dockerfile
+++ b/8.6-rc/alpine3.23/fpm/Dockerfile
@@ -139,10 +139,8 @@ RUN set -eux; \
 # https://github.com/docker-library/php/issues/439
 		--with-mhash \
 		\
-# https://github.com/docker-library/php/issues/822
-# https://github.com/php/php-src/pull/21067/changes#diff-4b9db5b77bcd56aa33b310dc44c8bc99c729c9abb195df2e98e6985b81289ae8R130
-		--enable-pic \
-		\
+# Forcing PIC also removes -fpie from executable objects, preventing local-exec TLS.
+# So do not --enable-pic
 # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
 		--enable-mysqlnd \
 # https://wiki.php.net/rfc/argon2_password_hash
diff --git a/8.6-rc/alpine3.24/cli/Dockerfile b/8.6-rc/alpine3.24/cli/Dockerfile
index 2ffa89cd6..d5feb0d1f 100644
--- a/8.6-rc/alpine3.24/cli/Dockerfile
+++ b/8.6-rc/alpine3.24/cli/Dockerfile
@@ -139,10 +139,8 @@ RUN set -eux; \
 # https://github.com/docker-library/php/issues/439
 		--with-mhash \
 		\
-# https://github.com/docker-library/php/issues/822
-# https://github.com/php/php-src/pull/21067/changes#diff-4b9db5b77bcd56aa33b310dc44c8bc99c729c9abb195df2e98e6985b81289ae8R130
-		--enable-pic \
-		\
+# Forcing PIC also removes -fpie from executable objects, preventing local-exec TLS.
+# So do not --enable-pic
 # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
 		--enable-mysqlnd \
 # https://wiki.php.net/rfc/argon2_password_hash
diff --git a/8.6-rc/alpine3.24/fpm/Dockerfile b/8.6-rc/alpine3.24/fpm/Dockerfile
index 3a568672e..dbe8d2524 100644
--- a/8.6-rc/alpine3.24/fpm/Dockerfile
+++ b/8.6-rc/alpine3.24/fpm/Dockerfile
@@ -139,10 +139,8 @@ RUN set -eux; \
 # https://github.com/docker-library/php/issues/439
 		--with-mhash \
 		\
-# https://github.com/docker-library/php/issues/822
-# https://github.com/php/php-src/pull/21067/changes#diff-4b9db5b77bcd56aa33b310dc44c8bc99c729c9abb195df2e98e6985b81289ae8R130
-		--enable-pic \
-		\
+# Forcing PIC also removes -fpie from executable objects, preventing local-exec TLS.
+# So do not --enable-pic
 # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
 		--enable-mysqlnd \
 # https://wiki.php.net/rfc/argon2_password_hash
diff --git a/8.6-rc/bookworm/cli/Dockerfile b/8.6-rc/bookworm/cli/Dockerfile
index 8b0beb02a..fe4f78c2a 100644
--- a/8.6-rc/bookworm/cli/Dockerfile
+++ b/8.6-rc/bookworm/cli/Dockerfile
@@ -150,10 +150,8 @@ RUN set -eux; \
 # https://github.com/docker-library/php/issues/439
 		--with-mhash \
 		\
-# https://github.com/docker-library/php/issues/822
-# https://github.com/php/php-src/pull/21067/changes#diff-4b9db5b77bcd56aa33b310dc44c8bc99c729c9abb195df2e98e6985b81289ae8R130
-		--enable-pic \
-		\
+# Forcing PIC also removes -fpie from executable objects, preventing local-exec TLS.
+# So do not --enable-pic
 # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
 		--enable-mysqlnd \
 # https://wiki.php.net/rfc/argon2_password_hash
diff --git a/8.6-rc/bookworm/fpm/Dockerfile b/8.6-rc/bookworm/fpm/Dockerfile
index 395a246c2..b8183aaf4 100644
--- a/8.6-rc/bookworm/fpm/Dockerfile
+++ b/8.6-rc/bookworm/fpm/Dockerfile
@@ -150,10 +150,8 @@ RUN set -eux; \
 # https://github.com/docker-library/php/issues/439
 		--with-mhash \
 		\
-# https://github.com/docker-library/php/issues/822
-# https://github.com/php/php-src/pull/21067/changes#diff-4b9db5b77bcd56aa33b310dc44c8bc99c729c9abb195df2e98e6985b81289ae8R130
-		--enable-pic \
-		\
+# Forcing PIC also removes -fpie from executable objects, preventing local-exec TLS.
+# So do not --enable-pic
 # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
 		--enable-mysqlnd \
 # https://wiki.php.net/rfc/argon2_password_hash
diff --git a/8.6-rc/trixie/cli/Dockerfile b/8.6-rc/trixie/cli/Dockerfile
index 5823b3649..1f5786dc3 100644
--- a/8.6-rc/trixie/cli/Dockerfile
+++ b/8.6-rc/trixie/cli/Dockerfile
@@ -150,10 +150,8 @@ RUN set -eux; \
 # https://github.com/docker-library/php/issues/439
 		--with-mhash \
 		\
-# https://github.com/docker-library/php/issues/822
-# https://github.com/php/php-src/pull/21067/changes#diff-4b9db5b77bcd56aa33b310dc44c8bc99c729c9abb195df2e98e6985b81289ae8R130
-		--enable-pic \
-		\
+# Forcing PIC also removes -fpie from executable objects, preventing local-exec TLS.
+# So do not --enable-pic
 # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
 		--enable-mysqlnd \
 # https://wiki.php.net/rfc/argon2_password_hash
diff --git a/8.6-rc/trixie/fpm/Dockerfile b/8.6-rc/trixie/fpm/Dockerfile
index 7773c60a6..a5c74b639 100644
--- a/8.6-rc/trixie/fpm/Dockerfile
+++ b/8.6-rc/trixie/fpm/Dockerfile
@@ -150,10 +150,8 @@ RUN set -eux; \
 # https://github.com/docker-library/php/issues/439
 		--with-mhash \
 		\
-# https://github.com/docker-library/php/issues/822
-# https://github.com/php/php-src/pull/21067/changes#diff-4b9db5b77bcd56aa33b310dc44c8bc99c729c9abb195df2e98e6985b81289ae8R130
-		--enable-pic \
-		\
+# Forcing PIC also removes -fpie from executable objects, preventing local-exec TLS.
+# So do not --enable-pic
 # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
 		--enable-mysqlnd \
 # https://wiki.php.net/rfc/argon2_password_hash
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index f32636aeb..ec3a53817 100644
--- a/Dockerfile-linux.template
+++ b/Dockerfile-linux.template
@@ -374,11 +374,14 @@ RUN set -eux; \
 # https://github.com/docker-library/php/issues/822
 		--with-pic \
 		\
-{{ ) else ( -}}
+{{ ) elif env.variant == "apache" then ( -}}
 # https://github.com/docker-library/php/issues/822
 # https://github.com/php/php-src/pull/21067/changes#diff-4b9db5b77bcd56aa33b310dc44c8bc99c729c9abb195df2e98e6985b81289ae8R130
 		--enable-pic \
 		\
+{{ ) else ( -}}
+# Forcing PIC also removes -fpie from executable objects, preventing local-exec TLS.
+# So do not --enable-pic
 {{ ) end -}}
 {{ if install_pear_pecl then ( -}}
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)