diff --git a/.travis.yml b/.travis.yml
index 498af65b4..0390d3116 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,50 +5,37 @@ env:
   - VERSION=7.3-rc VARIANT=stretch/cli
   - VERSION=7.3-rc VARIANT=stretch/apache
   - VERSION=7.3-rc VARIANT=stretch/fpm
-  - VERSION=7.3-rc VARIANT=stretch/zts
   - VERSION=7.3-rc VARIANT=alpine3.8/cli
   - VERSION=7.3-rc VARIANT=alpine3.8/fpm
-  - VERSION=7.3-rc VARIANT=alpine3.8/zts
   - VERSION=7.2 VARIANT=stretch/cli
   - VERSION=7.2 VARIANT=stretch/apache
   - VERSION=7.2 VARIANT=stretch/fpm
-  - VERSION=7.2 VARIANT=stretch/zts
   - VERSION=7.2 VARIANT=alpine3.8/cli
   - VERSION=7.2 VARIANT=alpine3.8/fpm
-  - VERSION=7.2 VARIANT=alpine3.8/zts
   - VERSION=7.1 VARIANT=stretch/cli
   - VERSION=7.1 VARIANT=stretch/apache
   - VERSION=7.1 VARIANT=stretch/fpm
-  - VERSION=7.1 VARIANT=stretch/zts
   - VERSION=7.1 VARIANT=jessie/cli
   - VERSION=7.1 VARIANT=jessie/apache
   - VERSION=7.1 VARIANT=jessie/fpm
-  - VERSION=7.1 VARIANT=jessie/zts
   - VERSION=7.1 VARIANT=alpine3.8/cli
   - VERSION=7.1 VARIANT=alpine3.8/fpm
-  - VERSION=7.1 VARIANT=alpine3.8/zts
   - VERSION=7.0 VARIANT=stretch/cli
   - VERSION=7.0 VARIANT=stretch/apache
   - VERSION=7.0 VARIANT=stretch/fpm
-  - VERSION=7.0 VARIANT=stretch/zts
   - VERSION=7.0 VARIANT=jessie/cli
   - VERSION=7.0 VARIANT=jessie/apache
   - VERSION=7.0 VARIANT=jessie/fpm
-  - VERSION=7.0 VARIANT=jessie/zts
   - VERSION=7.0 VARIANT=alpine3.7/cli
   - VERSION=7.0 VARIANT=alpine3.7/fpm
-  - VERSION=7.0 VARIANT=alpine3.7/zts
   - VERSION=5.6 VARIANT=stretch/cli
   - VERSION=5.6 VARIANT=stretch/apache
   - VERSION=5.6 VARIANT=stretch/fpm
-  - VERSION=5.6 VARIANT=stretch/zts
   - VERSION=5.6 VARIANT=jessie/cli
   - VERSION=5.6 VARIANT=jessie/apache
   - VERSION=5.6 VARIANT=jessie/fpm
-  - VERSION=5.6 VARIANT=jessie/zts
   - VERSION=5.6 VARIANT=alpine3.8/cli
   - VERSION=5.6 VARIANT=alpine3.8/fpm
-  - VERSION=5.6 VARIANT=alpine3.8/zts
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile
index b4032a5f7..dd59cd2d2 100644
--- a/5.6/jessie/apache/Dockerfile
+++ b/5.6/jessie/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/5.6/stretch/apache/Dockerfile b/5.6/stretch/apache/Dockerfile
index ff5b32488..790170182 100644
--- a/5.6/stretch/apache/Dockerfile
+++ b/5.6/stretch/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/7.0/jessie/apache/Dockerfile b/7.0/jessie/apache/Dockerfile
index 8fe802852..77a51cb57 100644
--- a/7.0/jessie/apache/Dockerfile
+++ b/7.0/jessie/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/7.0/stretch/apache/Dockerfile b/7.0/stretch/apache/Dockerfile
index bea2942ab..ae6b9da7d 100644
--- a/7.0/stretch/apache/Dockerfile
+++ b/7.0/stretch/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/7.1/jessie/apache/Dockerfile b/7.1/jessie/apache/Dockerfile
index 614dbdafd..33dec37e7 100644
--- a/7.1/jessie/apache/Dockerfile
+++ b/7.1/jessie/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/7.1/stretch/apache/Dockerfile b/7.1/stretch/apache/Dockerfile
index f9cbf8556..dff78487e 100644
--- a/7.1/stretch/apache/Dockerfile
+++ b/7.1/stretch/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile
index de86cf395..490246863 100644
--- a/7.2/stretch/apache/Dockerfile
+++ b/7.2/stretch/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/7.3-rc/stretch/apache/Dockerfile b/7.3-rc/stretch/apache/Dockerfile
index 05b3e8638..d845462b1 100644
--- a/7.3-rc/stretch/apache/Dockerfile
+++ b/7.3-rc/stretch/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/apache-Dockerfile-block-1 b/apache-Dockerfile-block-1
index 8c2fbecbd..d3f71aae0 100644
--- a/apache-Dockerfile-block-1
+++ b/apache-Dockerfile-block-1
@@ -58,4 +58,4 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index f78b9aa2e..7d09a1140 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -94,9 +94,9 @@ for version in "${versions[@]}"; do
 			cli \
 			apache \
 			fpm \
-			zts \
 		; do
 			dir="$version/$suite/$variant"
+
 			[ -f "$dir/Dockerfile" ] || continue
 
 			commit="$(dirCommit "$dir")"
@@ -104,6 +104,14 @@ for version in "${versions[@]}"; do
 
 			baseAliases=( $fullVersion "${versionAliases[@]}" )
 			variantAliases=( "${baseAliases[@]/%/-$variant}" )
+			# zts (thread safe php) is available in the apache image, so lets keep a compatability tag for zts on old versions
+			# https://github.com/docker-library/php/issues/742
+			# TODO remove zts tags completely
+			if [ "$variant" = 'apache' ]; then
+				if [ "$version" = '7.2' ] || [ "$version" = '7.1' ] || [ "$version" = '7.0' ] || [ "$version" = '5.6' ]; then
+					variantAliases+=( "${baseAliases[@]/%/-zts}" )
+				fi
+			fi
 			variantAliases=( "${variantAliases[@]//latest-/}" )
 
 			if [ "$variant" = 'cli' ]; then
diff --git a/update.sh b/update.sh
index 21db60a58..cd671de13 100755
--- a/update.sh
+++ b/update.sh
@@ -139,7 +139,7 @@ for version in "${versions[@]}"; do
 			baseDockerfile=Dockerfile-alpine.template
 		fi
 
-		for variant in cli apache fpm zts; do
+		for variant in cli apache fpm; do
 			[ -d "$version/$suite/$variant" ] || continue
 			{ generated_warning; cat "$baseDockerfile"; } > "$version/$suite/$variant/Dockerfile"