diff --git a/7.1/alpine3.8/cli/Dockerfile b/7.1/alpine3.8/cli/Dockerfile
index 61244e9d..f8e624c9 100644
--- a/7.1/alpine3.8/cli/Dockerfile
+++ b/7.1/alpine3.8/cli/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -95,7 +95,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -161,9 +161,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.1/alpine3.8/cli/docker-php-ext-enable b/7.1/alpine3.8/cli/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/alpine3.8/cli/docker-php-ext-enable
+++ b/7.1/alpine3.8/cli/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/alpine3.8/cli/docker-php-ext-install b/7.1/alpine3.8/cli/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/alpine3.8/cli/docker-php-ext-install
+++ b/7.1/alpine3.8/cli/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.1/alpine3.8/fpm/Dockerfile b/7.1/alpine3.8/fpm/Dockerfile
index e1e53d78..9db34d64 100644
--- a/7.1/alpine3.8/fpm/Dockerfile
+++ b/7.1/alpine3.8/fpm/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -96,7 +96,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -162,9 +162,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.1/alpine3.8/fpm/docker-php-ext-enable b/7.1/alpine3.8/fpm/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/alpine3.8/fpm/docker-php-ext-enable
+++ b/7.1/alpine3.8/fpm/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/alpine3.8/fpm/docker-php-ext-install b/7.1/alpine3.8/fpm/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/alpine3.8/fpm/docker-php-ext-install
+++ b/7.1/alpine3.8/fpm/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.1/alpine3.8/zts/Dockerfile b/7.1/alpine3.8/zts/Dockerfile
index bbd1a729..e4be6d32 100644
--- a/7.1/alpine3.8/zts/Dockerfile
+++ b/7.1/alpine3.8/zts/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -96,7 +96,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -162,9 +162,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.1/alpine3.8/zts/docker-php-ext-enable b/7.1/alpine3.8/zts/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/alpine3.8/zts/docker-php-ext-enable
+++ b/7.1/alpine3.8/zts/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/alpine3.8/zts/docker-php-ext-install b/7.1/alpine3.8/zts/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/alpine3.8/zts/docker-php-ext-install
+++ b/7.1/alpine3.8/zts/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.1/alpine3.9/cli/Dockerfile b/7.1/alpine3.9/cli/Dockerfile
index 1b4d3490..1dd1c251 100644
--- a/7.1/alpine3.9/cli/Dockerfile
+++ b/7.1/alpine3.9/cli/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -95,7 +95,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -161,9 +161,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.1/alpine3.9/cli/docker-php-ext-enable b/7.1/alpine3.9/cli/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/alpine3.9/cli/docker-php-ext-enable
+++ b/7.1/alpine3.9/cli/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/alpine3.9/cli/docker-php-ext-install b/7.1/alpine3.9/cli/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/alpine3.9/cli/docker-php-ext-install
+++ b/7.1/alpine3.9/cli/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.1/alpine3.9/fpm/Dockerfile b/7.1/alpine3.9/fpm/Dockerfile
index e750f053..01e94b08 100644
--- a/7.1/alpine3.9/fpm/Dockerfile
+++ b/7.1/alpine3.9/fpm/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -96,7 +96,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -162,9 +162,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.1/alpine3.9/fpm/docker-php-ext-enable b/7.1/alpine3.9/fpm/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/alpine3.9/fpm/docker-php-ext-enable
+++ b/7.1/alpine3.9/fpm/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/alpine3.9/fpm/docker-php-ext-install b/7.1/alpine3.9/fpm/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/alpine3.9/fpm/docker-php-ext-install
+++ b/7.1/alpine3.9/fpm/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.1/alpine3.9/zts/Dockerfile b/7.1/alpine3.9/zts/Dockerfile
index adabd573..8dbe5c69 100644
--- a/7.1/alpine3.9/zts/Dockerfile
+++ b/7.1/alpine3.9/zts/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -96,7 +96,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -162,9 +162,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.1/alpine3.9/zts/docker-php-ext-enable b/7.1/alpine3.9/zts/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/alpine3.9/zts/docker-php-ext-enable
+++ b/7.1/alpine3.9/zts/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/alpine3.9/zts/docker-php-ext-install b/7.1/alpine3.9/zts/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/alpine3.9/zts/docker-php-ext-install
+++ b/7.1/alpine3.9/zts/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.1/jessie/apache/docker-php-ext-enable b/7.1/jessie/apache/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/jessie/apache/docker-php-ext-enable
+++ b/7.1/jessie/apache/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/jessie/apache/docker-php-ext-install b/7.1/jessie/apache/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/jessie/apache/docker-php-ext-install
+++ b/7.1/jessie/apache/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.1/jessie/cli/docker-php-ext-enable b/7.1/jessie/cli/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/jessie/cli/docker-php-ext-enable
+++ b/7.1/jessie/cli/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/jessie/cli/docker-php-ext-install b/7.1/jessie/cli/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/jessie/cli/docker-php-ext-install
+++ b/7.1/jessie/cli/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.1/jessie/fpm/docker-php-ext-enable b/7.1/jessie/fpm/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/jessie/fpm/docker-php-ext-enable
+++ b/7.1/jessie/fpm/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/jessie/fpm/docker-php-ext-install b/7.1/jessie/fpm/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/jessie/fpm/docker-php-ext-install
+++ b/7.1/jessie/fpm/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.1/jessie/zts/docker-php-ext-enable b/7.1/jessie/zts/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/jessie/zts/docker-php-ext-enable
+++ b/7.1/jessie/zts/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/jessie/zts/docker-php-ext-install b/7.1/jessie/zts/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/jessie/zts/docker-php-ext-install
+++ b/7.1/jessie/zts/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.1/stretch/apache/docker-php-ext-enable b/7.1/stretch/apache/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/stretch/apache/docker-php-ext-enable
+++ b/7.1/stretch/apache/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/stretch/apache/docker-php-ext-install b/7.1/stretch/apache/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/stretch/apache/docker-php-ext-install
+++ b/7.1/stretch/apache/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.1/stretch/cli/docker-php-ext-enable b/7.1/stretch/cli/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/stretch/cli/docker-php-ext-enable
+++ b/7.1/stretch/cli/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/stretch/cli/docker-php-ext-install b/7.1/stretch/cli/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/stretch/cli/docker-php-ext-install
+++ b/7.1/stretch/cli/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.1/stretch/fpm/docker-php-ext-enable b/7.1/stretch/fpm/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/stretch/fpm/docker-php-ext-enable
+++ b/7.1/stretch/fpm/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/stretch/fpm/docker-php-ext-install b/7.1/stretch/fpm/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/stretch/fpm/docker-php-ext-install
+++ b/7.1/stretch/fpm/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.1/stretch/zts/docker-php-ext-enable b/7.1/stretch/zts/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.1/stretch/zts/docker-php-ext-enable
+++ b/7.1/stretch/zts/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.1/stretch/zts/docker-php-ext-install b/7.1/stretch/zts/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.1/stretch/zts/docker-php-ext-install
+++ b/7.1/stretch/zts/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.2/alpine3.8/cli/Dockerfile b/7.2/alpine3.8/cli/Dockerfile
index 32310dfb..507ded68 100644
--- a/7.2/alpine3.8/cli/Dockerfile
+++ b/7.2/alpine3.8/cli/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -95,7 +95,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -167,9 +167,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.2/alpine3.8/cli/docker-php-ext-enable b/7.2/alpine3.8/cli/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.2/alpine3.8/cli/docker-php-ext-enable
+++ b/7.2/alpine3.8/cli/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.2/alpine3.8/cli/docker-php-ext-install b/7.2/alpine3.8/cli/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.2/alpine3.8/cli/docker-php-ext-install
+++ b/7.2/alpine3.8/cli/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.2/alpine3.8/fpm/Dockerfile b/7.2/alpine3.8/fpm/Dockerfile
index 98ad0348..e393e280 100644
--- a/7.2/alpine3.8/fpm/Dockerfile
+++ b/7.2/alpine3.8/fpm/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -96,7 +96,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -168,9 +168,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.2/alpine3.8/fpm/docker-php-ext-enable b/7.2/alpine3.8/fpm/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.2/alpine3.8/fpm/docker-php-ext-enable
+++ b/7.2/alpine3.8/fpm/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.2/alpine3.8/fpm/docker-php-ext-install b/7.2/alpine3.8/fpm/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.2/alpine3.8/fpm/docker-php-ext-install
+++ b/7.2/alpine3.8/fpm/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.2/alpine3.8/zts/Dockerfile b/7.2/alpine3.8/zts/Dockerfile
index 13120725..5614901f 100644
--- a/7.2/alpine3.8/zts/Dockerfile
+++ b/7.2/alpine3.8/zts/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -96,7 +96,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -168,9 +168,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.2/alpine3.8/zts/docker-php-ext-enable b/7.2/alpine3.8/zts/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.2/alpine3.8/zts/docker-php-ext-enable
+++ b/7.2/alpine3.8/zts/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.2/alpine3.8/zts/docker-php-ext-install b/7.2/alpine3.8/zts/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.2/alpine3.8/zts/docker-php-ext-install
+++ b/7.2/alpine3.8/zts/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.2/alpine3.9/cli/Dockerfile b/7.2/alpine3.9/cli/Dockerfile
index b7414095..f0f0ade9 100644
--- a/7.2/alpine3.9/cli/Dockerfile
+++ b/7.2/alpine3.9/cli/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -95,7 +95,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -167,9 +167,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.2/alpine3.9/cli/docker-php-ext-enable b/7.2/alpine3.9/cli/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.2/alpine3.9/cli/docker-php-ext-enable
+++ b/7.2/alpine3.9/cli/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.2/alpine3.9/cli/docker-php-ext-install b/7.2/alpine3.9/cli/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.2/alpine3.9/cli/docker-php-ext-install
+++ b/7.2/alpine3.9/cli/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.2/alpine3.9/fpm/Dockerfile b/7.2/alpine3.9/fpm/Dockerfile
index cd300c77..61093d2d 100644
--- a/7.2/alpine3.9/fpm/Dockerfile
+++ b/7.2/alpine3.9/fpm/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -96,7 +96,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -168,9 +168,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.2/alpine3.9/fpm/docker-php-ext-enable b/7.2/alpine3.9/fpm/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.2/alpine3.9/fpm/docker-php-ext-enable
+++ b/7.2/alpine3.9/fpm/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.2/alpine3.9/fpm/docker-php-ext-install b/7.2/alpine3.9/fpm/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.2/alpine3.9/fpm/docker-php-ext-install
+++ b/7.2/alpine3.9/fpm/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.2/alpine3.9/zts/Dockerfile b/7.2/alpine3.9/zts/Dockerfile
index 9271b0aa..6f0c3384 100644
--- a/7.2/alpine3.9/zts/Dockerfile
+++ b/7.2/alpine3.9/zts/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -96,7 +96,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -168,9 +168,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.2/alpine3.9/zts/docker-php-ext-enable b/7.2/alpine3.9/zts/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.2/alpine3.9/zts/docker-php-ext-enable
+++ b/7.2/alpine3.9/zts/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.2/alpine3.9/zts/docker-php-ext-install b/7.2/alpine3.9/zts/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.2/alpine3.9/zts/docker-php-ext-install
+++ b/7.2/alpine3.9/zts/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.2/stretch/apache/docker-php-ext-enable b/7.2/stretch/apache/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.2/stretch/apache/docker-php-ext-enable
+++ b/7.2/stretch/apache/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.2/stretch/apache/docker-php-ext-install b/7.2/stretch/apache/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.2/stretch/apache/docker-php-ext-install
+++ b/7.2/stretch/apache/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.2/stretch/cli/docker-php-ext-enable b/7.2/stretch/cli/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.2/stretch/cli/docker-php-ext-enable
+++ b/7.2/stretch/cli/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.2/stretch/cli/docker-php-ext-install b/7.2/stretch/cli/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.2/stretch/cli/docker-php-ext-install
+++ b/7.2/stretch/cli/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.2/stretch/fpm/docker-php-ext-enable b/7.2/stretch/fpm/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.2/stretch/fpm/docker-php-ext-enable
+++ b/7.2/stretch/fpm/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.2/stretch/fpm/docker-php-ext-install b/7.2/stretch/fpm/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.2/stretch/fpm/docker-php-ext-install
+++ b/7.2/stretch/fpm/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.2/stretch/zts/docker-php-ext-enable b/7.2/stretch/zts/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.2/stretch/zts/docker-php-ext-enable
+++ b/7.2/stretch/zts/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.2/stretch/zts/docker-php-ext-install b/7.2/stretch/zts/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.2/stretch/zts/docker-php-ext-install
+++ b/7.2/stretch/zts/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.3/alpine3.8/cli/Dockerfile b/7.3/alpine3.8/cli/Dockerfile
index 0f5cf318..5a46d6da 100644
--- a/7.3/alpine3.8/cli/Dockerfile
+++ b/7.3/alpine3.8/cli/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -95,7 +95,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -167,9 +167,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.3/alpine3.8/cli/docker-php-ext-enable b/7.3/alpine3.8/cli/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.3/alpine3.8/cli/docker-php-ext-enable
+++ b/7.3/alpine3.8/cli/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.3/alpine3.8/cli/docker-php-ext-install b/7.3/alpine3.8/cli/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.3/alpine3.8/cli/docker-php-ext-install
+++ b/7.3/alpine3.8/cli/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.3/alpine3.8/fpm/Dockerfile b/7.3/alpine3.8/fpm/Dockerfile
index 7cf43090..4ab262c3 100644
--- a/7.3/alpine3.8/fpm/Dockerfile
+++ b/7.3/alpine3.8/fpm/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -96,7 +96,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -168,9 +168,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.3/alpine3.8/fpm/docker-php-ext-enable b/7.3/alpine3.8/fpm/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.3/alpine3.8/fpm/docker-php-ext-enable
+++ b/7.3/alpine3.8/fpm/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.3/alpine3.8/fpm/docker-php-ext-install b/7.3/alpine3.8/fpm/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.3/alpine3.8/fpm/docker-php-ext-install
+++ b/7.3/alpine3.8/fpm/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.3/alpine3.8/zts/Dockerfile b/7.3/alpine3.8/zts/Dockerfile
index 0464d9ab..07b4cbf3 100644
--- a/7.3/alpine3.8/zts/Dockerfile
+++ b/7.3/alpine3.8/zts/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -96,7 +96,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -168,9 +168,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.3/alpine3.8/zts/docker-php-ext-enable b/7.3/alpine3.8/zts/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.3/alpine3.8/zts/docker-php-ext-enable
+++ b/7.3/alpine3.8/zts/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.3/alpine3.8/zts/docker-php-ext-install b/7.3/alpine3.8/zts/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.3/alpine3.8/zts/docker-php-ext-install
+++ b/7.3/alpine3.8/zts/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.3/alpine3.9/cli/Dockerfile b/7.3/alpine3.9/cli/Dockerfile
index c9146851..e973338d 100644
--- a/7.3/alpine3.9/cli/Dockerfile
+++ b/7.3/alpine3.9/cli/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -95,7 +95,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -167,9 +167,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.3/alpine3.9/cli/docker-php-ext-enable b/7.3/alpine3.9/cli/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.3/alpine3.9/cli/docker-php-ext-enable
+++ b/7.3/alpine3.9/cli/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.3/alpine3.9/cli/docker-php-ext-install b/7.3/alpine3.9/cli/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.3/alpine3.9/cli/docker-php-ext-install
+++ b/7.3/alpine3.9/cli/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.3/alpine3.9/fpm/Dockerfile b/7.3/alpine3.9/fpm/Dockerfile
index 1c9e986d..b37ae947 100644
--- a/7.3/alpine3.9/fpm/Dockerfile
+++ b/7.3/alpine3.9/fpm/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -96,7 +96,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -168,9 +168,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.3/alpine3.9/fpm/docker-php-ext-enable b/7.3/alpine3.9/fpm/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.3/alpine3.9/fpm/docker-php-ext-enable
+++ b/7.3/alpine3.9/fpm/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.3/alpine3.9/fpm/docker-php-ext-install b/7.3/alpine3.9/fpm/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.3/alpine3.9/fpm/docker-php-ext-install
+++ b/7.3/alpine3.9/fpm/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.3/alpine3.9/zts/Dockerfile b/7.3/alpine3.9/zts/Dockerfile
index 9d191168..74c20012 100644
--- a/7.3/alpine3.9/zts/Dockerfile
+++ b/7.3/alpine3.9/zts/Dockerfile
@@ -20,7 +20,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -96,7 +96,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -168,9 +168,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/7.3/alpine3.9/zts/docker-php-ext-enable b/7.3/alpine3.9/zts/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.3/alpine3.9/zts/docker-php-ext-enable
+++ b/7.3/alpine3.9/zts/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.3/alpine3.9/zts/docker-php-ext-install b/7.3/alpine3.9/zts/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.3/alpine3.9/zts/docker-php-ext-install
+++ b/7.3/alpine3.9/zts/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.3/stretch/apache/docker-php-ext-enable b/7.3/stretch/apache/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.3/stretch/apache/docker-php-ext-enable
+++ b/7.3/stretch/apache/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.3/stretch/apache/docker-php-ext-install b/7.3/stretch/apache/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.3/stretch/apache/docker-php-ext-install
+++ b/7.3/stretch/apache/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.3/stretch/cli/docker-php-ext-enable b/7.3/stretch/cli/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.3/stretch/cli/docker-php-ext-enable
+++ b/7.3/stretch/cli/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.3/stretch/cli/docker-php-ext-install b/7.3/stretch/cli/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.3/stretch/cli/docker-php-ext-install
+++ b/7.3/stretch/cli/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.3/stretch/fpm/docker-php-ext-enable b/7.3/stretch/fpm/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.3/stretch/fpm/docker-php-ext-enable
+++ b/7.3/stretch/fpm/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.3/stretch/fpm/docker-php-ext-install b/7.3/stretch/fpm/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.3/stretch/fpm/docker-php-ext-install
+++ b/7.3/stretch/fpm/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/7.3/stretch/zts/docker-php-ext-enable b/7.3/stretch/zts/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/7.3/stretch/zts/docker-php-ext-enable
+++ b/7.3/stretch/zts/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/7.3/stretch/zts/docker-php-ext-install b/7.3/stretch/zts/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/7.3/stretch/zts/docker-php-ext-install
+++ b/7.3/stretch/zts/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index d25bff83..a1e3ed5f 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -14,7 +14,7 @@ ENV PHPIZE_DEPS \
 		re2c
 
 # persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
+RUN apk add --no-cache \
 		ca-certificates \
 		curl \
 		tar \
@@ -89,7 +89,7 @@ RUN set -xe; \
 		rm -rf "$GNUPGHOME"; \
 	fi; \
 	\
-	apk del .fetch-deps
+	apk del --no-network .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
 
@@ -161,9 +161,9 @@ RUN set -xe \
 			| sort -u \
 			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
+	&& apk add --no-cache $runDeps \
 	\
-	&& apk del .build-deps \
+	&& apk del --no-network .build-deps \
 	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
diff --git a/docker-php-ext-enable b/docker-php-ext-enable
index 2b067f03..564328ca 100755
--- a/docker-php-ext-enable
+++ b/docker-php-ext-enable
@@ -110,5 +110,5 @@ for module in $modules; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
diff --git a/docker-php-ext-install b/docker-php-ext-install
index d75d6d79..1afa6627 100755
--- a/docker-php-ext-install
+++ b/docker-php-ext-install
@@ -114,7 +114,7 @@ for ext in $exts; do
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
+	apk del --no-network $apkDel
 fi
 
 if [ -e /usr/src/php/.docker-delete-me ]; then