diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index de4020fa..603d2360 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -111,8 +111,6 @@ RUN set -xe \
 # make sure invalid --configure-flags are fatal errors intead of just warnings
 		--enable-option-checking=fatal \
 		\
-		--disable-cgi \
-		\
 # https://github.com/docker-library/php/issues/439
 		--with-mhash \
 		\
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 02a9908f..ceb00be7 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -131,8 +131,6 @@ RUN set -eux; \
 # make sure invalid --configure-flags are fatal errors intead of just warnings
 		--enable-option-checking=fatal \
 		\
-		--disable-cgi \
-		\
 # https://github.com/docker-library/php/issues/439
 		--with-mhash \
 		\
diff --git a/apache-Dockerfile-block-1 b/apache-Dockerfile-block-1
index eacbba05..a8e00783 100644
--- a/apache-Dockerfile-block-1
+++ b/apache-Dockerfile-block-1
@@ -56,4 +56,4 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
+ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
diff --git a/fpm-Dockerfile-block-1 b/fpm-Dockerfile-block-1
index 959fd928..0e76496a 100644
--- a/fpm-Dockerfile-block-1
+++ b/fpm-Dockerfile-block-1
@@ -1 +1 @@
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
+ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
diff --git a/zts-Dockerfile-block-1 b/zts-Dockerfile-block-1
index e471e3ee..56495d2c 100644
--- a/zts-Dockerfile-block-1
+++ b/zts-Dockerfile-block-1
@@ -1 +1 @@
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
+ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi