diff --git a/7.4/alpine3.15/zts/Dockerfile b/7.4/alpine3.15/zts/Dockerfile
index 262b77c0c9..e013c65f5b 100644
--- a/7.4/alpine3.15/zts/Dockerfile
+++ b/7.4/alpine3.15/zts/Dockerfile
@@ -164,6 +164,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
+		\
 		--enable-maintainer-zts \
 # https://externals.io/message/118859
 		--disable-zend-signals \
diff --git a/7.4/alpine3.16/zts/Dockerfile b/7.4/alpine3.16/zts/Dockerfile
index c3f29e8381..2d63b6b3a1 100644
--- a/7.4/alpine3.16/zts/Dockerfile
+++ b/7.4/alpine3.16/zts/Dockerfile
@@ -164,6 +164,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
+		\
 		--enable-maintainer-zts \
 # https://externals.io/message/118859
 		--disable-zend-signals \
diff --git a/8.0-rc/alpine3.15/zts/Dockerfile b/8.0-rc/alpine3.15/zts/Dockerfile
index f4d5e90397..84136fed1e 100644
--- a/8.0-rc/alpine3.15/zts/Dockerfile
+++ b/8.0-rc/alpine3.15/zts/Dockerfile
@@ -162,6 +162,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
+		\
 		--enable-zts \
 # https://externals.io/message/118859
 		--disable-zend-signals \
diff --git a/8.0-rc/alpine3.16/zts/Dockerfile b/8.0-rc/alpine3.16/zts/Dockerfile
index 9d345a8f28..b3947cb1ae 100644
--- a/8.0-rc/alpine3.16/zts/Dockerfile
+++ b/8.0-rc/alpine3.16/zts/Dockerfile
@@ -162,6 +162,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
+		\
 		--enable-zts \
 # https://externals.io/message/118859
 		--disable-zend-signals \
diff --git a/8.0/alpine3.15/zts/Dockerfile b/8.0/alpine3.15/zts/Dockerfile
index a69f0e8a43..7bad81193b 100644
--- a/8.0/alpine3.15/zts/Dockerfile
+++ b/8.0/alpine3.15/zts/Dockerfile
@@ -162,6 +162,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
+		\
 		--enable-zts \
 # https://externals.io/message/118859
 		--disable-zend-signals \
diff --git a/8.0/alpine3.16/zts/Dockerfile b/8.0/alpine3.16/zts/Dockerfile
index 8e10bdd74c..dade68391c 100644
--- a/8.0/alpine3.16/zts/Dockerfile
+++ b/8.0/alpine3.16/zts/Dockerfile
@@ -162,6 +162,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
+		\
 		--enable-zts \
 # https://externals.io/message/118859
 		--disable-zend-signals \
diff --git a/8.1/alpine3.15/zts/Dockerfile b/8.1/alpine3.15/zts/Dockerfile
index 7040dd8551..62e904051b 100644
--- a/8.1/alpine3.15/zts/Dockerfile
+++ b/8.1/alpine3.15/zts/Dockerfile
@@ -162,6 +162,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
+		\
 		--enable-zts \
 # https://externals.io/message/118859
 		--disable-zend-signals \
diff --git a/8.1/alpine3.16/zts/Dockerfile b/8.1/alpine3.16/zts/Dockerfile
index 654b131bb6..55f407a118 100644
--- a/8.1/alpine3.16/zts/Dockerfile
+++ b/8.1/alpine3.16/zts/Dockerfile
@@ -162,6 +162,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
+		\
 		--enable-zts \
 # https://externals.io/message/118859
 		--disable-zend-signals \
diff --git a/8.2-rc/alpine3.15/zts/Dockerfile b/8.2-rc/alpine3.15/zts/Dockerfile
index 450e2713ed..412187b7df 100644
--- a/8.2-rc/alpine3.15/zts/Dockerfile
+++ b/8.2-rc/alpine3.15/zts/Dockerfile
@@ -162,6 +162,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
+		\
 		--enable-zts \
 # https://externals.io/message/118859
 		--disable-zend-signals \
diff --git a/8.2-rc/alpine3.16/zts/Dockerfile b/8.2-rc/alpine3.16/zts/Dockerfile
index 3375406d52..e002bb890c 100644
--- a/8.2-rc/alpine3.16/zts/Dockerfile
+++ b/8.2-rc/alpine3.16/zts/Dockerfile
@@ -162,6 +162,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
+		\
 		--enable-zts \
 # https://externals.io/message/118859
 		--disable-zend-signals \
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index 1fb9b1e385..a4a9ae0eb4 100644
--- a/Dockerfile-linux.template
+++ b/Dockerfile-linux.template
@@ -373,7 +373,7 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 {{ ) end -}}
-{{ if (env.variant == "cli" or env.variant == "zts") and (is_alpine | not) then ( -}}
+{{ if (env.variant == "zts") or (env.variant == "cli" and (is_alpine | not)) then ( -}}
 		\
 # https://github.com/docker-library/php/pull/939#issuecomment-730501748
 		--enable-embed \