diff --git a/7/jre7-alpine/Dockerfile b/7/jre7-alpine/Dockerfile
index b4a3ea8f3..3d7ae8b8f 100644
--- a/7/jre7-alpine/Dockerfile
+++ b/7/jre7-alpine/Dockerfile
@@ -15,7 +15,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 7
 ENV TOMCAT_VERSION 7.0.85
-ENV TOMCAT_SHA1 243a8be0bb445c412342965ee8fdf751d9c587e7
+ENV TOMCAT_SHA512 ed4f9d85fafe21570af7e01e712ebfb878066f9fab99d344935e20cf1f18c3389e103d33feb6937b5382408f3d356dbd8e7668bc82d2998412222bc099a1f8f7
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -55,7 +55,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/7/jre7-slim/Dockerfile b/7/jre7-slim/Dockerfile
index 5563a6fa3..c5a73951d 100644
--- a/7/jre7-slim/Dockerfile
+++ b/7/jre7-slim/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 7
 ENV TOMCAT_VERSION 7.0.85
-ENV TOMCAT_SHA1 243a8be0bb445c412342965ee8fdf751d9c587e7
+ENV TOMCAT_SHA512 ed4f9d85fafe21570af7e01e712ebfb878066f9fab99d344935e20cf1f18c3389e103d33feb6937b5382408f3d356dbd8e7668bc82d2998412222bc099a1f8f7
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/7/jre7/Dockerfile b/7/jre7/Dockerfile
index c06dddc14..15b1a627d 100644
--- a/7/jre7/Dockerfile
+++ b/7/jre7/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 7
 ENV TOMCAT_VERSION 7.0.85
-ENV TOMCAT_SHA1 243a8be0bb445c412342965ee8fdf751d9c587e7
+ENV TOMCAT_SHA512 ed4f9d85fafe21570af7e01e712ebfb878066f9fab99d344935e20cf1f18c3389e103d33feb6937b5382408f3d356dbd8e7668bc82d2998412222bc099a1f8f7
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/7/jre8-alpine/Dockerfile b/7/jre8-alpine/Dockerfile
index b710d1ef3..1337d6649 100644
--- a/7/jre8-alpine/Dockerfile
+++ b/7/jre8-alpine/Dockerfile
@@ -15,7 +15,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 7
 ENV TOMCAT_VERSION 7.0.85
-ENV TOMCAT_SHA1 243a8be0bb445c412342965ee8fdf751d9c587e7
+ENV TOMCAT_SHA512 ed4f9d85fafe21570af7e01e712ebfb878066f9fab99d344935e20cf1f18c3389e103d33feb6937b5382408f3d356dbd8e7668bc82d2998412222bc099a1f8f7
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -55,7 +55,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/7/jre8-slim/Dockerfile b/7/jre8-slim/Dockerfile
index 23299aa40..1bdd4a2fe 100644
--- a/7/jre8-slim/Dockerfile
+++ b/7/jre8-slim/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 7
 ENV TOMCAT_VERSION 7.0.85
-ENV TOMCAT_SHA1 243a8be0bb445c412342965ee8fdf751d9c587e7
+ENV TOMCAT_SHA512 ed4f9d85fafe21570af7e01e712ebfb878066f9fab99d344935e20cf1f18c3389e103d33feb6937b5382408f3d356dbd8e7668bc82d2998412222bc099a1f8f7
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/7/jre8/Dockerfile b/7/jre8/Dockerfile
index 574abe835..0320fb470 100644
--- a/7/jre8/Dockerfile
+++ b/7/jre8/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 7
 ENV TOMCAT_VERSION 7.0.85
-ENV TOMCAT_SHA1 243a8be0bb445c412342965ee8fdf751d9c587e7
+ENV TOMCAT_SHA512 ed4f9d85fafe21570af7e01e712ebfb878066f9fab99d344935e20cf1f18c3389e103d33feb6937b5382408f3d356dbd8e7668bc82d2998412222bc099a1f8f7
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/8.0/jre7-alpine/Dockerfile b/8.0/jre7-alpine/Dockerfile
index e97081bfa..88b19e75c 100644
--- a/8.0/jre7-alpine/Dockerfile
+++ b/8.0/jre7-alpine/Dockerfile
@@ -15,7 +15,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.0.50
-ENV TOMCAT_SHA1 ec66581d322a8ef58e3988fc72e2c076968f3e2e
+ENV TOMCAT_SHA512 c8923e610f1d3f7f13d5d0cc765a97ef1b5b34a527b57dfb7058f0bd65555cec748b83198859e6bba41b29cc3d5071ed05618097edc5d6cfad2f380f8230e7f5
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -55,7 +55,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/8.0/jre7-slim/Dockerfile b/8.0/jre7-slim/Dockerfile
index 94fad471c..8ba02cb0a 100644
--- a/8.0/jre7-slim/Dockerfile
+++ b/8.0/jre7-slim/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.0.50
-ENV TOMCAT_SHA1 ec66581d322a8ef58e3988fc72e2c076968f3e2e
+ENV TOMCAT_SHA512 c8923e610f1d3f7f13d5d0cc765a97ef1b5b34a527b57dfb7058f0bd65555cec748b83198859e6bba41b29cc3d5071ed05618097edc5d6cfad2f380f8230e7f5
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/8.0/jre7/Dockerfile b/8.0/jre7/Dockerfile
index 266531c09..db7ae21b1 100644
--- a/8.0/jre7/Dockerfile
+++ b/8.0/jre7/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.0.50
-ENV TOMCAT_SHA1 ec66581d322a8ef58e3988fc72e2c076968f3e2e
+ENV TOMCAT_SHA512 c8923e610f1d3f7f13d5d0cc765a97ef1b5b34a527b57dfb7058f0bd65555cec748b83198859e6bba41b29cc3d5071ed05618097edc5d6cfad2f380f8230e7f5
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/8.0/jre8-alpine/Dockerfile b/8.0/jre8-alpine/Dockerfile
index eb157c1ab..403f52330 100644
--- a/8.0/jre8-alpine/Dockerfile
+++ b/8.0/jre8-alpine/Dockerfile
@@ -15,7 +15,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.0.50
-ENV TOMCAT_SHA1 ec66581d322a8ef58e3988fc72e2c076968f3e2e
+ENV TOMCAT_SHA512 c8923e610f1d3f7f13d5d0cc765a97ef1b5b34a527b57dfb7058f0bd65555cec748b83198859e6bba41b29cc3d5071ed05618097edc5d6cfad2f380f8230e7f5
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -55,7 +55,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/8.0/jre8-slim/Dockerfile b/8.0/jre8-slim/Dockerfile
index c0ce2c629..101358bd7 100644
--- a/8.0/jre8-slim/Dockerfile
+++ b/8.0/jre8-slim/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.0.50
-ENV TOMCAT_SHA1 ec66581d322a8ef58e3988fc72e2c076968f3e2e
+ENV TOMCAT_SHA512 c8923e610f1d3f7f13d5d0cc765a97ef1b5b34a527b57dfb7058f0bd65555cec748b83198859e6bba41b29cc3d5071ed05618097edc5d6cfad2f380f8230e7f5
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/8.0/jre8/Dockerfile b/8.0/jre8/Dockerfile
index 850428fc9..20f4ef192 100644
--- a/8.0/jre8/Dockerfile
+++ b/8.0/jre8/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.0.50
-ENV TOMCAT_SHA1 ec66581d322a8ef58e3988fc72e2c076968f3e2e
+ENV TOMCAT_SHA512 c8923e610f1d3f7f13d5d0cc765a97ef1b5b34a527b57dfb7058f0bd65555cec748b83198859e6bba41b29cc3d5071ed05618097edc5d6cfad2f380f8230e7f5
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/8.5/jre10-slim/Dockerfile b/8.5/jre10-slim/Dockerfile
index d7a27b7dc..0301c7558 100644
--- a/8.5/jre10-slim/Dockerfile
+++ b/8.5/jre10-slim/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.5.30
-ENV TOMCAT_SHA1 95798f8fe05549f72be84f927a7f8fe6342211a0
+ENV TOMCAT_SHA512 f7e84fed604dc183dc1bdad07f3b025547d95d024ccfb05da68f5f45256f3082af6ba28c7f0148ae4ee43637248a0074c92bb12198ab58331d0c4f04906b86b6
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/8.5/jre10/Dockerfile b/8.5/jre10/Dockerfile
index 6f53318ba..871015e9e 100644
--- a/8.5/jre10/Dockerfile
+++ b/8.5/jre10/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.5.30
-ENV TOMCAT_SHA1 95798f8fe05549f72be84f927a7f8fe6342211a0
+ENV TOMCAT_SHA512 f7e84fed604dc183dc1bdad07f3b025547d95d024ccfb05da68f5f45256f3082af6ba28c7f0148ae4ee43637248a0074c92bb12198ab58331d0c4f04906b86b6
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/8.5/jre8-alpine/Dockerfile b/8.5/jre8-alpine/Dockerfile
index 0b1f235b0..24a20f834 100644
--- a/8.5/jre8-alpine/Dockerfile
+++ b/8.5/jre8-alpine/Dockerfile
@@ -15,7 +15,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.5.30
-ENV TOMCAT_SHA1 95798f8fe05549f72be84f927a7f8fe6342211a0
+ENV TOMCAT_SHA512 f7e84fed604dc183dc1bdad07f3b025547d95d024ccfb05da68f5f45256f3082af6ba28c7f0148ae4ee43637248a0074c92bb12198ab58331d0c4f04906b86b6
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -55,7 +55,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/8.5/jre8-slim/Dockerfile b/8.5/jre8-slim/Dockerfile
index 6c98b8fd8..810617e9e 100644
--- a/8.5/jre8-slim/Dockerfile
+++ b/8.5/jre8-slim/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.5.30
-ENV TOMCAT_SHA1 95798f8fe05549f72be84f927a7f8fe6342211a0
+ENV TOMCAT_SHA512 f7e84fed604dc183dc1bdad07f3b025547d95d024ccfb05da68f5f45256f3082af6ba28c7f0148ae4ee43637248a0074c92bb12198ab58331d0c4f04906b86b6
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/8.5/jre8/Dockerfile b/8.5/jre8/Dockerfile
index 34ac944ff..488f28610 100644
--- a/8.5/jre8/Dockerfile
+++ b/8.5/jre8/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.5.30
-ENV TOMCAT_SHA1 95798f8fe05549f72be84f927a7f8fe6342211a0
+ENV TOMCAT_SHA512 f7e84fed604dc183dc1bdad07f3b025547d95d024ccfb05da68f5f45256f3082af6ba28c7f0148ae4ee43637248a0074c92bb12198ab58331d0c4f04906b86b6
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/8.5/jre9-slim/Dockerfile b/8.5/jre9-slim/Dockerfile
index 8a99138a6..68871004d 100644
--- a/8.5/jre9-slim/Dockerfile
+++ b/8.5/jre9-slim/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.5.30
-ENV TOMCAT_SHA1 95798f8fe05549f72be84f927a7f8fe6342211a0
+ENV TOMCAT_SHA512 f7e84fed604dc183dc1bdad07f3b025547d95d024ccfb05da68f5f45256f3082af6ba28c7f0148ae4ee43637248a0074c92bb12198ab58331d0c4f04906b86b6
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/8.5/jre9/Dockerfile b/8.5/jre9/Dockerfile
index c0d51a275..3a96dd250 100644
--- a/8.5/jre9/Dockerfile
+++ b/8.5/jre9/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.5.30
-ENV TOMCAT_SHA1 95798f8fe05549f72be84f927a7f8fe6342211a0
+ENV TOMCAT_SHA512 f7e84fed604dc183dc1bdad07f3b025547d95d024ccfb05da68f5f45256f3082af6ba28c7f0148ae4ee43637248a0074c92bb12198ab58331d0c4f04906b86b6
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/9.0/jre10-slim/Dockerfile b/9.0/jre10-slim/Dockerfile
index 421de3e09..f419c019c 100644
--- a/9.0/jre10-slim/Dockerfile
+++ b/9.0/jre10-slim/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 9
 ENV TOMCAT_VERSION 9.0.7
-ENV TOMCAT_SHA1 488c237dbd92778c356de7f9ff3a59da19a5b3ef
+ENV TOMCAT_SHA512 2050f368a32c44ed1b8bc6d2c964fb47e4f9c7ec2c4222141bd0edcd9da1708185c00eba63ccf28b1d55f452284ed0265058913d58d2f1ef10be8a6b7da1711f
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/9.0/jre10/Dockerfile b/9.0/jre10/Dockerfile
index 6aa534069..023b1abc8 100644
--- a/9.0/jre10/Dockerfile
+++ b/9.0/jre10/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 9
 ENV TOMCAT_VERSION 9.0.7
-ENV TOMCAT_SHA1 488c237dbd92778c356de7f9ff3a59da19a5b3ef
+ENV TOMCAT_SHA512 2050f368a32c44ed1b8bc6d2c964fb47e4f9c7ec2c4222141bd0edcd9da1708185c00eba63ccf28b1d55f452284ed0265058913d58d2f1ef10be8a6b7da1711f
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/9.0/jre8-alpine/Dockerfile b/9.0/jre8-alpine/Dockerfile
index 773e54a1c..520a9ad14 100644
--- a/9.0/jre8-alpine/Dockerfile
+++ b/9.0/jre8-alpine/Dockerfile
@@ -15,7 +15,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 9
 ENV TOMCAT_VERSION 9.0.7
-ENV TOMCAT_SHA1 488c237dbd92778c356de7f9ff3a59da19a5b3ef
+ENV TOMCAT_SHA512 2050f368a32c44ed1b8bc6d2c964fb47e4f9c7ec2c4222141bd0edcd9da1708185c00eba63ccf28b1d55f452284ed0265058913d58d2f1ef10be8a6b7da1711f
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -55,7 +55,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/9.0/jre8-slim/Dockerfile b/9.0/jre8-slim/Dockerfile
index 53d9c7328..ca369796b 100644
--- a/9.0/jre8-slim/Dockerfile
+++ b/9.0/jre8-slim/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 9
 ENV TOMCAT_VERSION 9.0.7
-ENV TOMCAT_SHA1 488c237dbd92778c356de7f9ff3a59da19a5b3ef
+ENV TOMCAT_SHA512 2050f368a32c44ed1b8bc6d2c964fb47e4f9c7ec2c4222141bd0edcd9da1708185c00eba63ccf28b1d55f452284ed0265058913d58d2f1ef10be8a6b7da1711f
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/9.0/jre8/Dockerfile b/9.0/jre8/Dockerfile
index 20446d9e0..ac39b9544 100644
--- a/9.0/jre8/Dockerfile
+++ b/9.0/jre8/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 9
 ENV TOMCAT_VERSION 9.0.7
-ENV TOMCAT_SHA1 488c237dbd92778c356de7f9ff3a59da19a5b3ef
+ENV TOMCAT_SHA512 2050f368a32c44ed1b8bc6d2c964fb47e4f9c7ec2c4222141bd0edcd9da1708185c00eba63ccf28b1d55f452284ed0265058913d58d2f1ef10be8a6b7da1711f
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/9.0/jre9-slim/Dockerfile b/9.0/jre9-slim/Dockerfile
index 2fd8d995b..1b9796a44 100644
--- a/9.0/jre9-slim/Dockerfile
+++ b/9.0/jre9-slim/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 9
 ENV TOMCAT_VERSION 9.0.7
-ENV TOMCAT_SHA1 488c237dbd92778c356de7f9ff3a59da19a5b3ef
+ENV TOMCAT_SHA512 2050f368a32c44ed1b8bc6d2c964fb47e4f9c7ec2c4222141bd0edcd9da1708185c00eba63ccf28b1d55f452284ed0265058913d58d2f1ef10be8a6b7da1711f
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/9.0/jre9/Dockerfile b/9.0/jre9/Dockerfile
index 3c43dc78e..53c6d2b5b 100644
--- a/9.0/jre9/Dockerfile
+++ b/9.0/jre9/Dockerfile
@@ -53,7 +53,7 @@ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E626
 
 ENV TOMCAT_MAJOR 9
 ENV TOMCAT_VERSION 9.0.7
-ENV TOMCAT_SHA1 488c237dbd92778c356de7f9ff3a59da19a5b3ef
+ENV TOMCAT_SHA512 2050f368a32c44ed1b8bc6d2c964fb47e4f9c7ec2c4222141bd0edcd9da1708185c00eba63ccf28b1d55f452284ed0265058913d58d2f1ef10be8a6b7da1711f
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 751dfb1e9..6c9222504 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -15,7 +15,7 @@ ENV GPG_KEYS placeholder
 
 ENV TOMCAT_MAJOR placeholder
 ENV TOMCAT_VERSION placeholder
-ENV TOMCAT_SHA1 placeholder
+ENV TOMCAT_SHA512 placeholder
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -55,7 +55,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/Dockerfile.template b/Dockerfile.template
index 43b409df5..bd37c4961 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -53,7 +53,7 @@ ENV GPG_KEYS placeholder
 
 ENV TOMCAT_MAJOR placeholder
 ENV TOMCAT_VERSION placeholder
-ENV TOMCAT_SHA1 placeholder
+ENV TOMCAT_SHA512 placeholder
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
@@ -93,7 +93,7 @@ RUN set -eux; \
 	done; \
 	[ -n "$success" ]; \
 	\
-	echo "$TOMCAT_SHA1 *tomcat.tar.gz" | sha1sum -c -; \
+	echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
 	\
 	success=; \
 	for url in $TOMCAT_ASC_URLS; do \
diff --git a/update.sh b/update.sh
index 8306bcada..40c0ab397 100755
--- a/update.sh
+++ b/update.sh
@@ -123,12 +123,12 @@ for version in "${versions[@]}"; do
 			| tail -1
 	)"
 
-	sha1="$(
-		curl -fsSL "https://www-us.apache.org/dist/tomcat/tomcat-$majorVersion/v$fullVersion/bin/apache-tomcat-$fullVersion.tar.gz.sha1" \
+	sha512="$(
+		curl -fsSL "https://www-us.apache.org/dist/tomcat/tomcat-$majorVersion/v$fullVersion/bin/apache-tomcat-$fullVersion.tar.gz.sha512" \
 			| cut -d' ' -f1
 	)"
 
-	echo "$version: $fullVersion ($sha1)"
+	echo "$version: $fullVersion ($sha512)"
 
 	for variant in "$version"/*/; do
 		variant="$(basename "$variant")"
@@ -155,7 +155,7 @@ for version in "${versions[@]}"; do
 			-e 's/^(FROM) .*/\1 '"$baseImage"'/' \
 			-e 's/^(ENV OPENSSL_VERSION) .*/\1 '"${opensslVersionDebian}"'/' \
 			-e 's/^(ENV TOMCAT_MAJOR) .*/\1 '"$majorVersion"'/' \
-			-e 's/^(ENV TOMCAT_SHA1) .*/\1 '"$sha1"'/' \
+			-e 's/^(ENV TOMCAT_SHA512) .*/\1 '"$sha512"'/' \
 			-e 's/^(ENV GPG_KEYS) .*/\1 '"${versionGpgKeys[*]}"'/' \
 			"Dockerfile${subVariant:+-$subVariant}.template" \
 			> "$version/$variant/Dockerfile"