diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile
index 9571cff9c4..05ffa637c3 100644
--- a/10/alpine/Dockerfile
+++ b/10/alpine/Dockerfile
@@ -23,11 +23,6 @@ ENV PG_SHA256 4d701f450cd92ffb123cf6c296e9656abbc2ab7ea6507894ff1e2475ae0754e1
 
 RUN set -ex \
 	\
-	&& apk add --no-cache --virtual .fetch-deps \
-		ca-certificates \
-		openssl \
-		tar \
-	\
 	&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
 	&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
 	&& mkdir -p /usr/src/postgresql \
@@ -124,7 +119,7 @@ RUN set -ex \
 # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
 # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
 		tzdata \
-	&& apk del .fetch-deps .build-deps \
+	&& apk del --no-network .build-deps \
 	&& cd / \
 	&& rm -rf \
 		/usr/src/postgresql \
diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile
index 42cc7c4b4d..0bd32e2a11 100644
--- a/11/alpine/Dockerfile
+++ b/11/alpine/Dockerfile
@@ -23,11 +23,6 @@ ENV PG_SHA256 eaf2f4329ccc349c89e950761b81daf8c99bb8966abcab5665ccd6ee95c77ae2
 
 RUN set -ex \
 	\
-	&& apk add --no-cache --virtual .fetch-deps \
-		ca-certificates \
-		openssl \
-		tar \
-	\
 	&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
 	&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
 	&& mkdir -p /usr/src/postgresql \
@@ -126,7 +121,7 @@ RUN set -ex \
 # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
 # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
 		tzdata \
-	&& apk del .fetch-deps .build-deps \
+	&& apk del --no-network .build-deps \
 	&& cd / \
 	&& rm -rf \
 		/usr/src/postgresql \
diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile
index 8d24a8a05e..0fa15a9125 100644
--- a/12/alpine/Dockerfile
+++ b/12/alpine/Dockerfile
@@ -23,11 +23,6 @@ ENV PG_SHA256 94ed64a6179048190695c86ec707cc25d016056ce10fc9d229267d9a8f1dcf41
 
 RUN set -ex \
 	\
-	&& apk add --no-cache --virtual .fetch-deps \
-		ca-certificates \
-		openssl \
-		tar \
-	\
 	&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
 	&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
 	&& mkdir -p /usr/src/postgresql \
@@ -126,7 +121,7 @@ RUN set -ex \
 # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
 # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
 		tzdata \
-	&& apk del .fetch-deps .build-deps \
+	&& apk del --no-network .build-deps \
 	&& cd / \
 	&& rm -rf \
 		/usr/src/postgresql \
diff --git a/13/alpine/Dockerfile b/13/alpine/Dockerfile
index d3c882e554..ec0a198102 100644
--- a/13/alpine/Dockerfile
+++ b/13/alpine/Dockerfile
@@ -23,11 +23,6 @@ ENV PG_SHA256 249ba0d0227d5393b83d397f2543354bfee579276cb1e821e9b7d904a42039e1
 
 RUN set -ex \
 	\
-	&& apk add --no-cache --virtual .fetch-deps \
-		ca-certificates \
-		openssl \
-		tar \
-	\
 	&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
 	&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
 	&& mkdir -p /usr/src/postgresql \
@@ -126,7 +121,7 @@ RUN set -ex \
 # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
 # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
 		tzdata \
-	&& apk del .fetch-deps .build-deps \
+	&& apk del --no-network .build-deps \
 	&& cd / \
 	&& rm -rf \
 		/usr/src/postgresql \
diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile
index b9f76da027..324db32870 100644
--- a/9.5/alpine/Dockerfile
+++ b/9.5/alpine/Dockerfile
@@ -23,11 +23,6 @@ ENV PG_SHA256 48555470a17248cb204d25ab1ad4231ef16295db55161922f006b9942d69640f
 
 RUN set -ex \
 	\
-	&& apk add --no-cache --virtual .fetch-deps \
-		ca-certificates \
-		openssl \
-		tar \
-	\
 	&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
 	&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
 	&& mkdir -p /usr/src/postgresql \
@@ -122,7 +117,7 @@ RUN set -ex \
 # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
 # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
 		tzdata \
-	&& apk del .fetch-deps .build-deps \
+	&& apk del --no-network .build-deps \
 	&& cd / \
 	&& rm -rf \
 		/usr/src/postgresql \
diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile
index 767dca2a89..814f145b43 100644
--- a/9.6/alpine/Dockerfile
+++ b/9.6/alpine/Dockerfile
@@ -23,11 +23,6 @@ ENV PG_SHA256 517ec282b785e6d22f360c30ba0c5e2a506fca5ca07dcc545427511d94c89999
 
 RUN set -ex \
 	\
-	&& apk add --no-cache --virtual .fetch-deps \
-		ca-certificates \
-		openssl \
-		tar \
-	\
 	&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
 	&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
 	&& mkdir -p /usr/src/postgresql \
@@ -122,7 +117,7 @@ RUN set -ex \
 # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
 # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
 		tzdata \
-	&& apk del .fetch-deps .build-deps \
+	&& apk del --no-network .build-deps \
 	&& cd / \
 	&& rm -rf \
 		/usr/src/postgresql \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 26a47a4798..c0ffab0e6c 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -23,11 +23,6 @@ ENV PG_SHA256 %%PG_SHA256%%
 
 RUN set -ex \
 	\
-	&& apk add --no-cache --virtual .fetch-deps \
-		ca-certificates \
-		openssl \
-		tar \
-	\
 	&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
 	&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
 	&& mkdir -p /usr/src/postgresql \
@@ -126,7 +121,7 @@ RUN set -ex \
 # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
 # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
 		tzdata \
-	&& apk del .fetch-deps .build-deps \
+	&& apk del --no-network .build-deps \
 	&& cd / \
 	&& rm -rf \
 		/usr/src/postgresql \