diff --git a/.travis.yml b/.travis.yml
index bae4dcd8c..04f061f87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,28 +2,28 @@ language: bash
 services: docker
 
 env:
+  - VERSION=9.0 VARIANT=jre8
   - VERSION=9.0 VARIANT=jre8-slim
   - VERSION=9.0 VARIANT=jre8-alpine
-  - VERSION=9.0 VARIANT=jre8
-  - VERSION=9.0 VARIANT=jre10-slim
   - VERSION=9.0 VARIANT=jre10
+  - VERSION=9.0 VARIANT=jre10-slim
+  - VERSION=8.5 VARIANT=jre8
   - VERSION=8.5 VARIANT=jre8-slim
   - VERSION=8.5 VARIANT=jre8-alpine
-  - VERSION=8.5 VARIANT=jre8
-  - VERSION=8.5 VARIANT=jre10-slim
   - VERSION=8.5 VARIANT=jre10
+  - VERSION=8.5 VARIANT=jre10-slim
+  - VERSION=8.0 VARIANT=jre8
   - VERSION=8.0 VARIANT=jre8-slim
   - VERSION=8.0 VARIANT=jre8-alpine
-  - VERSION=8.0 VARIANT=jre8
+  - VERSION=8.0 VARIANT=jre7
   - VERSION=8.0 VARIANT=jre7-slim
   - VERSION=8.0 VARIANT=jre7-alpine
-  - VERSION=8.0 VARIANT=jre7
+  - VERSION=7 VARIANT=jre8
   - VERSION=7 VARIANT=jre8-slim
   - VERSION=7 VARIANT=jre8-alpine
-  - VERSION=7 VARIANT=jre8
+  - VERSION=7 VARIANT=jre7
   - VERSION=7 VARIANT=jre7-slim
   - VERSION=7 VARIANT=jre7-alpine
-  - VERSION=7 VARIANT=jre7
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
diff --git a/7/jre7-alpine/Dockerfile b/7/jre7-alpine/Dockerfile
index 130812f03..d3bba8dc4 100644
--- a/7/jre7-alpine/Dockerfile
+++ b/7/jre7-alpine/Dockerfile
@@ -43,7 +43,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \	
 	done; \
 	\
 	success=; \
diff --git a/7/jre7-slim/Dockerfile b/7/jre7-slim/Dockerfile
index ba0a6362e..b37c1c4b9 100644
--- a/7/jre7-slim/Dockerfile
+++ b/7/jre7-slim/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/7/jre7/Dockerfile b/7/jre7/Dockerfile
index 6f4acdcd1..80639c0bc 100644
--- a/7/jre7/Dockerfile
+++ b/7/jre7/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/7/jre8-alpine/Dockerfile b/7/jre8-alpine/Dockerfile
index 3a28b1696..48e5d0d55 100644
--- a/7/jre8-alpine/Dockerfile
+++ b/7/jre8-alpine/Dockerfile
@@ -43,7 +43,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \	
 	done; \
 	\
 	success=; \
diff --git a/7/jre8-slim/Dockerfile b/7/jre8-slim/Dockerfile
index c18045317..b97777a40 100644
--- a/7/jre8-slim/Dockerfile
+++ b/7/jre8-slim/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/7/jre8/Dockerfile b/7/jre8/Dockerfile
index 2c93d0d50..5d280d6bc 100644
--- a/7/jre8/Dockerfile
+++ b/7/jre8/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/8.0/jre7-alpine/Dockerfile b/8.0/jre7-alpine/Dockerfile
index 2fa2e82fd..b652cf95c 100644
--- a/8.0/jre7-alpine/Dockerfile
+++ b/8.0/jre7-alpine/Dockerfile
@@ -43,7 +43,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \	
 	done; \
 	\
 	success=; \
diff --git a/8.0/jre7-slim/Dockerfile b/8.0/jre7-slim/Dockerfile
index eda3c9cb2..5498ed47c 100644
--- a/8.0/jre7-slim/Dockerfile
+++ b/8.0/jre7-slim/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/8.0/jre7/Dockerfile b/8.0/jre7/Dockerfile
index c04aa379f..a45425aab 100644
--- a/8.0/jre7/Dockerfile
+++ b/8.0/jre7/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/8.0/jre8-alpine/Dockerfile b/8.0/jre8-alpine/Dockerfile
index d450ad952..6a577e75c 100644
--- a/8.0/jre8-alpine/Dockerfile
+++ b/8.0/jre8-alpine/Dockerfile
@@ -43,7 +43,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \	
 	done; \
 	\
 	success=; \
diff --git a/8.0/jre8-slim/Dockerfile b/8.0/jre8-slim/Dockerfile
index 013c2d56b..7eaec2f14 100644
--- a/8.0/jre8-slim/Dockerfile
+++ b/8.0/jre8-slim/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/8.0/jre8/Dockerfile b/8.0/jre8/Dockerfile
index 41f4c0689..880dcfdd8 100644
--- a/8.0/jre8/Dockerfile
+++ b/8.0/jre8/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/8.5/jre10-slim/Dockerfile b/8.5/jre10-slim/Dockerfile
index de535a95a..e2239f5b8 100644
--- a/8.5/jre10-slim/Dockerfile
+++ b/8.5/jre10-slim/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/8.5/jre10/Dockerfile b/8.5/jre10/Dockerfile
index 48ad8e378..0cb672de0 100644
--- a/8.5/jre10/Dockerfile
+++ b/8.5/jre10/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/8.5/jre8-alpine/Dockerfile b/8.5/jre8-alpine/Dockerfile
index 51903c5d7..9f4eafa5b 100644
--- a/8.5/jre8-alpine/Dockerfile
+++ b/8.5/jre8-alpine/Dockerfile
@@ -43,7 +43,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \	
 	done; \
 	\
 	success=; \
diff --git a/8.5/jre8-slim/Dockerfile b/8.5/jre8-slim/Dockerfile
index 391ebc557..c474ad1b8 100644
--- a/8.5/jre8-slim/Dockerfile
+++ b/8.5/jre8-slim/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/8.5/jre8/Dockerfile b/8.5/jre8/Dockerfile
index 74405a424..8660632a5 100644
--- a/8.5/jre8/Dockerfile
+++ b/8.5/jre8/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/9.0/jre10-slim/Dockerfile b/9.0/jre10-slim/Dockerfile
index c9d7fa865..a05ae4d39 100644
--- a/9.0/jre10-slim/Dockerfile
+++ b/9.0/jre10-slim/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/9.0/jre10/Dockerfile b/9.0/jre10/Dockerfile
index 49d717cd2..757fbb7ee 100644
--- a/9.0/jre10/Dockerfile
+++ b/9.0/jre10/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/9.0/jre8-alpine/Dockerfile b/9.0/jre8-alpine/Dockerfile
index 88af654a2..d3535a3df 100644
--- a/9.0/jre8-alpine/Dockerfile
+++ b/9.0/jre8-alpine/Dockerfile
@@ -43,7 +43,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \	
 	done; \
 	\
 	success=; \
diff --git a/9.0/jre8-slim/Dockerfile b/9.0/jre8-slim/Dockerfile
index 0fd4c969c..8dfee059f 100644
--- a/9.0/jre8-slim/Dockerfile
+++ b/9.0/jre8-slim/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/9.0/jre8/Dockerfile b/9.0/jre8/Dockerfile
index 2fe557b29..a57bf4270 100644
--- a/9.0/jre8/Dockerfile
+++ b/9.0/jre8/Dockerfile
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index d03f099b9..81deed75b 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -43,7 +43,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \	
 	done; \
 	\
 	success=; \
diff --git a/Dockerfile.template b/Dockerfile.template
index 178bc425a..977fba5b7 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -79,7 +79,13 @@ RUN set -eux; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+		for i in $(seq 1 4); do \
+			[ $i -lt 4 ] && set +e ; \
+			gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			retval=$? ; \
+			set -e ; \
+			[ $retval = 0 ] && break ; \
+		done; \
 	done; \
 	\
 	apt-get install -y --no-install-recommends wget ca-certificates; \