diff --git a/8.0-rc/alpine3.16/cli/Dockerfile b/8.0-rc/alpine3.16/cli/Dockerfile
index 4b203a588e..327c08f019 100644
--- a/8.0-rc/alpine3.16/cli/Dockerfile
+++ b/8.0-rc/alpine3.16/cli/Dockerfile
@@ -160,6 +160,9 @@ RUN set -eux; \
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
+		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
 	; \
 	make -j "$(nproc)"; \
 	find -type f -name '*.a' -delete; \
diff --git a/8.0/alpine3.16/cli/Dockerfile b/8.0/alpine3.16/cli/Dockerfile
index 3df82b6152..bd2dc8bdf6 100644
--- a/8.0/alpine3.16/cli/Dockerfile
+++ b/8.0/alpine3.16/cli/Dockerfile
@@ -160,6 +160,9 @@ RUN set -eux; \
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
+		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
 	; \
 	make -j "$(nproc)"; \
 	find -type f -name '*.a' -delete; \
diff --git a/8.1/alpine3.16/cli/Dockerfile b/8.1/alpine3.16/cli/Dockerfile
index 5c009d5a97..5b7a9164dd 100644
--- a/8.1/alpine3.16/cli/Dockerfile
+++ b/8.1/alpine3.16/cli/Dockerfile
@@ -160,6 +160,9 @@ RUN set -eux; \
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
+		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
 	; \
 	make -j "$(nproc)"; \
 	find -type f -name '*.a' -delete; \
diff --git a/8.1/alpine3.17/cli/Dockerfile b/8.1/alpine3.17/cli/Dockerfile
index ce7dc8f6e6..0969fabcc0 100644
--- a/8.1/alpine3.17/cli/Dockerfile
+++ b/8.1/alpine3.17/cli/Dockerfile
@@ -160,6 +160,9 @@ RUN set -eux; \
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
+		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
 	; \
 	make -j "$(nproc)"; \
 	find -type f -name '*.a' -delete; \
diff --git a/8.2/alpine3.16/cli/Dockerfile b/8.2/alpine3.16/cli/Dockerfile
index e4b95f48ba..8183bac490 100644
--- a/8.2/alpine3.16/cli/Dockerfile
+++ b/8.2/alpine3.16/cli/Dockerfile
@@ -160,6 +160,9 @@ RUN set -eux; \
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
+		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
 	; \
 	make -j "$(nproc)"; \
 	find -type f -name '*.a' -delete; \
diff --git a/8.2/alpine3.17/cli/Dockerfile b/8.2/alpine3.17/cli/Dockerfile
index 38c4cd4643..38fb11bfb3 100644
--- a/8.2/alpine3.17/cli/Dockerfile
+++ b/8.2/alpine3.17/cli/Dockerfile
@@ -160,6 +160,9 @@ RUN set -eux; \
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
+		\
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+		--enable-embed \
 	; \
 	make -j "$(nproc)"; \
 	find -type f -name '*.a' -delete; \
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index 8770bfed77..b3927d1abf 100644
--- a/Dockerfile-linux.template
+++ b/Dockerfile-linux.template
@@ -357,7 +357,7 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 {{ ) end -}}
-{{ if (env.variant == "zts") or (env.variant == "cli" and (is_alpine | not)) then ( -}}
+{{ if (env.variant == "zts") or (env.variant == "cli") then ( -}}
 		\
 # https://github.com/docker-library/php/pull/939#issuecomment-730501748
 		--enable-embed \