Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update tomcat #15438

Merged
merged 1 commit into from
Oct 12, 2023
Merged

Update tomcat #15438

merged 1 commit into from
Oct 12, 2023

Conversation

yosifkit
Copy link
Member

@yosifkit yosifkit commented Sep 26, 2023 •
edited
Loading

@github-actions

This comment has been minimized.

Sign in to view
@yosifkit
Copy link
Member Author

Re-ran the update.sh job to fix the failing "naughty" test. Will need to update tomcat repo to include an amazoncorretto:*al2023 jdk images so that we can still have an 11 image

@github-actions

This comment has been minimized.

Sign in to view
whalelines
whalelines reviewed Sep 27, 2023
View reviewed changes
library/tomcat Outdated Show resolved Hide resolved
@github-actions

This comment has been minimized.

Sign in to view
@github-actions
Copy link

Diff for a9545ab: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1097cee..e198ed6 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,232 +1,222 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/tomcat.git
 
-Tags: 8.5.93-jdk8-corretto-al2, 8.5-jdk8-corretto-al2, 8-jdk8-corretto-al2, 8.5.93-jdk8-corretto, 8.5-jdk8-corretto, 8-jdk8-corretto
+Tags: 8.5.94-jdk8-corretto-al2, 8.5-jdk8-corretto-al2, 8-jdk8-corretto-al2, 8.5.94-jdk8-corretto, 8.5-jdk8-corretto, 8-jdk8-corretto
 Architectures: amd64, arm64v8
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jdk8/corretto-al2
 
-Tags: 8.5.93-jdk8-temurin-focal, 8.5-jdk8-temurin-focal, 8-jdk8-temurin-focal
+Tags: 8.5.94-jdk8-temurin-focal, 8.5-jdk8-temurin-focal, 8-jdk8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jdk8/temurin-focal
 
-Tags: 8.5.93-jdk8-temurin-jammy, 8.5-jdk8-temurin-jammy, 8-jdk8-temurin-jammy, 8.5.93-jdk8-temurin, 8.5-jdk8-temurin, 8-jdk8-temurin, 8.5.93-jdk8, 8.5-jdk8, 8-jdk8
+Tags: 8.5.94-jdk8-temurin-jammy, 8.5-jdk8-temurin-jammy, 8-jdk8-temurin-jammy, 8.5.94-jdk8-temurin, 8.5-jdk8-temurin, 8-jdk8-temurin, 8.5.94-jdk8, 8.5-jdk8, 8-jdk8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jdk8/temurin-jammy
 
-Tags: 8.5.93-jdk11-corretto-al2, 8.5-jdk11-corretto-al2, 8-jdk11-corretto-al2, 8.5.93-jdk11-corretto, 8.5-jdk11-corretto, 8-jdk11-corretto
+Tags: 8.5.94-jdk11-corretto-al2, 8.5-jdk11-corretto-al2, 8-jdk11-corretto-al2, 8.5.94-jdk11-corretto, 8.5-jdk11-corretto, 8-jdk11-corretto
 Architectures: amd64, arm64v8
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jdk11/corretto-al2
 
-Tags: 8.5.93-jdk11-temurin-focal, 8.5-jdk11-temurin-focal, 8-jdk11-temurin-focal
+Tags: 8.5.94-jdk11-temurin-focal, 8.5-jdk11-temurin-focal, 8-jdk11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jdk11/temurin-focal
 
-Tags: 8.5.93-jdk11-temurin-jammy, 8.5-jdk11-temurin-jammy, 8-jdk11-temurin-jammy, 8.5.93-jdk11-temurin, 8.5-jdk11-temurin, 8-jdk11-temurin, 8.5.93-jdk11, 8.5-jdk11, 8-jdk11
+Tags: 8.5.94-jdk11-temurin-jammy, 8.5-jdk11-temurin-jammy, 8-jdk11-temurin-jammy, 8.5.94-jdk11-temurin, 8.5-jdk11-temurin, 8-jdk11-temurin, 8.5.94-jdk11, 8.5-jdk11, 8-jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jdk11/temurin-jammy
 
-Tags: 8.5.93-jdk17-corretto-al2, 8.5-jdk17-corretto-al2, 8-jdk17-corretto-al2, 8.5.93-jdk17-corretto, 8.5-jdk17-corretto, 8-jdk17-corretto
+Tags: 8.5.94-jdk17-corretto-al2, 8.5-jdk17-corretto-al2, 8-jdk17-corretto-al2, 8.5.94-jdk17-corretto, 8.5-jdk17-corretto, 8-jdk17-corretto
 Architectures: amd64, arm64v8
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jdk17/corretto-al2
 
-Tags: 8.5.93-jdk17-temurin-focal, 8.5-jdk17-temurin-focal, 8-jdk17-temurin-focal
+Tags: 8.5.94-jdk17-temurin-focal, 8.5-jdk17-temurin-focal, 8-jdk17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jdk17/temurin-focal
 
-Tags: 8.5.93-jdk17-temurin-jammy, 8.5-jdk17-temurin-jammy, 8-jdk17-temurin-jammy, 8.5.93-jdk17-temurin, 8.5-jdk17-temurin, 8-jdk17-temurin, 8.5.93-jdk17, 8.5-jdk17, 8-jdk17, 8.5.93, 8.5, 8
+Tags: 8.5.94-jdk17-temurin-jammy, 8.5-jdk17-temurin-jammy, 8-jdk17-temurin-jammy, 8.5.94-jdk17-temurin, 8.5-jdk17-temurin, 8-jdk17-temurin, 8.5.94-jdk17, 8.5-jdk17, 8-jdk17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jdk17/temurin-jammy
 
-Tags: 8.5.93-jdk21-openjdk-bookworm, 8.5-jdk21-openjdk-bookworm, 8-jdk21-openjdk-bookworm, 8.5.93-jdk21-openjdk, 8.5-jdk21-openjdk, 8-jdk21-openjdk
+Tags: 8.5.94-jdk21-corretto-al2, 8.5-jdk21-corretto-al2, 8-jdk21-corretto-al2, 8.5.94-jdk21-corretto, 8.5-jdk21-corretto, 8-jdk21-corretto
 Architectures: amd64, arm64v8
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
-Directory: 8.5/jdk21/openjdk-bookworm
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
+Directory: 8.5/jdk21/corretto-al2
 
-Tags: 8.5.93-jdk21-openjdk-bullseye, 8.5-jdk21-openjdk-bullseye, 8-jdk21-openjdk-bullseye
+Tags: 8.5.94-jdk21-temurin-jammy, 8.5-jdk21-temurin-jammy, 8-jdk21-temurin-jammy, 8.5.94-jdk21-temurin, 8.5-jdk21-temurin, 8-jdk21-temurin, 8.5.94-jdk21, 8.5-jdk21, 8-jdk21, 8.5.94, 8.5, 8
 Architectures: amd64, arm64v8
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
-Directory: 8.5/jdk21/openjdk-bullseye
+GitCommit: 2b0adfec11340b151c2b2385c7dc6de27677e10b
+Directory: 8.5/jdk21/temurin-jammy
 
-Tags: 8.5.93-jdk21-openjdk-slim-bookworm, 8.5-jdk21-openjdk-slim-bookworm, 8-jdk21-openjdk-slim-bookworm, 8.5.93-jdk21-openjdk-slim, 8.5-jdk21-openjdk-slim, 8-jdk21-openjdk-slim
-Architectures: amd64, arm64v8
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
-Directory: 8.5/jdk21/openjdk-slim-bookworm
-
-Tags: 8.5.93-jdk21-openjdk-slim-bullseye, 8.5-jdk21-openjdk-slim-bullseye, 8-jdk21-openjdk-slim-bullseye
-Architectures: amd64, arm64v8
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
-Directory: 8.5/jdk21/openjdk-slim-bullseye
-
-Tags: 8.5.93-jre8-temurin-focal, 8.5-jre8-temurin-focal, 8-jre8-temurin-focal
+Tags: 8.5.94-jre8-temurin-focal, 8.5-jre8-temurin-focal, 8-jre8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jre8/temurin-focal
 
-Tags: 8.5.93-jre8-temurin-jammy, 8.5-jre8-temurin-jammy, 8-jre8-temurin-jammy, 8.5.93-jre8-temurin, 8.5-jre8-temurin, 8-jre8-temurin, 8.5.93-jre8, 8.5-jre8, 8-jre8
+Tags: 8.5.94-jre8-temurin-jammy, 8.5-jre8-temurin-jammy, 8-jre8-temurin-jammy, 8.5.94-jre8-temurin, 8.5-jre8-temurin, 8-jre8-temurin, 8.5.94-jre8, 8.5-jre8, 8-jre8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jre8/temurin-jammy
 
-Tags: 8.5.93-jre11-temurin-focal, 8.5-jre11-temurin-focal, 8-jre11-temurin-focal
+Tags: 8.5.94-jre11-temurin-focal, 8.5-jre11-temurin-focal, 8-jre11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jre11/temurin-focal
 
-Tags: 8.5.93-jre11-temurin-jammy, 8.5-jre11-temurin-jammy, 8-jre11-temurin-jammy, 8.5.93-jre11-temurin, 8.5-jre11-temurin, 8-jre11-temurin, 8.5.93-jre11, 8.5-jre11, 8-jre11
+Tags: 8.5.94-jre11-temurin-jammy, 8.5-jre11-temurin-jammy, 8-jre11-temurin-jammy, 8.5.94-jre11-temurin, 8.5-jre11-temurin, 8-jre11-temurin, 8.5.94-jre11, 8.5-jre11, 8-jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jre11/temurin-jammy
 
-Tags: 8.5.93-jre17-temurin-focal, 8.5-jre17-temurin-focal, 8-jre17-temurin-focal
+Tags: 8.5.94-jre17-temurin-focal, 8.5-jre17-temurin-focal, 8-jre17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jre17/temurin-focal
 
-Tags: 8.5.93-jre17-temurin-jammy, 8.5-jre17-temurin-jammy, 8-jre17-temurin-jammy, 8.5.93-jre17-temurin, 8.5-jre17-temurin, 8-jre17-temurin, 8.5.93-jre17, 8.5-jre17, 8-jre17
+Tags: 8.5.94-jre17-temurin-jammy, 8.5-jre17-temurin-jammy, 8-jre17-temurin-jammy, 8.5.94-jre17-temurin, 8.5-jre17-temurin, 8-jre17-temurin, 8.5.94-jre17, 8.5-jre17, 8-jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: faaf983ea7148aa8697d9adb6b24d1d0f9e5e1a7
+GitCommit: 3e4ccf4f0918276c3a9a43156f070c6a9b16254c
 Directory: 8.5/jre17/temurin-jammy
 
-Tags: 9.0.80-jdk8-corretto-al2, 9.0-jdk8-corretto-al2, 9-jdk8-corretto-al2, 9.0.80-jdk8-corretto, 9.0-jdk8-corretto, 9-jdk8-corretto
+Tags: 8.5.94-jre21-temurin-jammy, 8.5-jre21-temurin-jammy, 8-jre21-temurin-jammy, 8.5.94-jre21-temurin, 8.5-jre21-temurin, 8-jre21-temurin, 8.5.94-jre21, 8.5-jre21, 8-jre21
 Architectures: amd64, arm64v8
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: 2b0adfec11340b151c2b2385c7dc6de27677e10b
+Directory: 8.5/jre21/temurin-jammy
+
+Tags: 9.0.81-jdk8-corretto-al2, 9.0-jdk8-corretto-al2, 9-jdk8-corretto-al2, 9.0.81-jdk8-corretto, 9.0-jdk8-corretto, 9-jdk8-corretto
+Architectures: amd64, arm64v8
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jdk8/corretto-al2
 
-Tags: 9.0.80-jdk8-temurin-focal, 9.0-jdk8-temurin-focal, 9-jdk8-temurin-focal
+Tags: 9.0.81-jdk8-temurin-focal, 9.0-jdk8-temurin-focal, 9-jdk8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jdk8/temurin-focal
 
-Tags: 9.0.80-jdk8-temurin-jammy, 9.0-jdk8-temurin-jammy, 9-jdk8-temurin-jammy, 9.0.80-jdk8-temurin, 9.0-jdk8-temurin, 9-jdk8-temurin, 9.0.80-jdk8, 9.0-jdk8, 9-jdk8
+Tags: 9.0.81-jdk8-temurin-jammy, 9.0-jdk8-temurin-jammy, 9-jdk8-temurin-jammy, 9.0.81-jdk8-temurin, 9.0-jdk8-temurin, 9-jdk8-temurin, 9.0.81-jdk8, 9.0-jdk8, 9-jdk8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jdk8/temurin-jammy
 
-Tags: 9.0.80-jdk11-corretto-al2, 9.0-jdk11-corretto-al2, 9-jdk11-corretto-al2, 9.0.80-jdk11-corretto, 9.0-jdk11-corretto, 9-jdk11-corretto
+Tags: 9.0.81-jdk11-corretto-al2, 9.0-jdk11-corretto-al2, 9-jdk11-corretto-al2, 9.0.81-jdk11-corretto, 9.0-jdk11-corretto, 9-jdk11-corretto
 Architectures: amd64, arm64v8
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jdk11/corretto-al2
 
-Tags: 9.0.80-jdk11-temurin-focal, 9.0-jdk11-temurin-focal, 9-jdk11-temurin-focal
+Tags: 9.0.81-jdk11-temurin-focal, 9.0-jdk11-temurin-focal, 9-jdk11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jdk11/temurin-focal
 
-Tags: 9.0.80-jdk11-temurin-jammy, 9.0-jdk11-temurin-jammy, 9-jdk11-temurin-jammy, 9.0.80-jdk11-temurin, 9.0-jdk11-temurin, 9-jdk11-temurin, 9.0.80-jdk11, 9.0-jdk11, 9-jdk11
+Tags: 9.0.81-jdk11-temurin-jammy, 9.0-jdk11-temurin-jammy, 9-jdk11-temurin-jammy, 9.0.81-jdk11-temurin, 9.0-jdk11-temurin, 9-jdk11-temurin, 9.0.81-jdk11, 9.0-jdk11, 9-jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jdk11/temurin-jammy
 
-Tags: 9.0.80-jdk17-corretto-al2, 9.0-jdk17-corretto-al2, 9-jdk17-corretto-al2, 9.0.80-jdk17-corretto, 9.0-jdk17-corretto, 9-jdk17-corretto
+Tags: 9.0.81-jdk17-corretto-al2, 9.0-jdk17-corretto-al2, 9-jdk17-corretto-al2, 9.0.81-jdk17-corretto, 9.0-jdk17-corretto, 9-jdk17-corretto
 Architectures: amd64, arm64v8
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jdk17/corretto-al2
 
-Tags: 9.0.80-jdk17-temurin-focal, 9.0-jdk17-temurin-focal, 9-jdk17-temurin-focal
+Tags: 9.0.81-jdk17-temurin-focal, 9.0-jdk17-temurin-focal, 9-jdk17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jdk17/temurin-focal
 
-Tags: 9.0.80-jdk17-temurin-jammy, 9.0-jdk17-temurin-jammy, 9-jdk17-temurin-jammy, 9.0.80-jdk17-temurin, 9.0-jdk17-temurin, 9-jdk17-temurin, 9.0.80-jdk17, 9.0-jdk17, 9-jdk17, 9.0.80, 9.0, 9
+Tags: 9.0.81-jdk17-temurin-jammy, 9.0-jdk17-temurin-jammy, 9-jdk17-temurin-jammy, 9.0.81-jdk17-temurin, 9.0-jdk17-temurin, 9-jdk17-temurin, 9.0.81-jdk17, 9.0-jdk17, 9-jdk17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jdk17/temurin-jammy
 
-Tags: 9.0.80-jdk21-openjdk-bookworm, 9.0-jdk21-openjdk-bookworm, 9-jdk21-openjdk-bookworm, 9.0.80-jdk21-openjdk, 9.0-jdk21-openjdk, 9-jdk21-openjdk
-Architectures: amd64, arm64v8
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
-Directory: 9.0/jdk21/openjdk-bookworm
-
-Tags: 9.0.80-jdk21-openjdk-bullseye, 9.0-jdk21-openjdk-bullseye, 9-jdk21-openjdk-bullseye
+Tags: 9.0.81-jdk21-corretto-al2, 9.0-jdk21-corretto-al2, 9-jdk21-corretto-al2, 9.0.81-jdk21-corretto, 9.0-jdk21-corretto, 9-jdk21-corretto
 Architectures: amd64, arm64v8
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
-Directory: 9.0/jdk21/openjdk-bullseye
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
+Directory: 9.0/jdk21/corretto-al2
 
-Tags: 9.0.80-jdk21-openjdk-slim-bookworm, 9.0-jdk21-openjdk-slim-bookworm, 9-jdk21-openjdk-slim-bookworm, 9.0.80-jdk21-openjdk-slim, 9.0-jdk21-openjdk-slim, 9-jdk21-openjdk-slim
+Tags: 9.0.81-jdk21-temurin-jammy, 9.0-jdk21-temurin-jammy, 9-jdk21-temurin-jammy, 9.0.81-jdk21-temurin, 9.0-jdk21-temurin, 9-jdk21-temurin, 9.0.81-jdk21, 9.0-jdk21, 9-jdk21, 9.0.81, 9.0, 9
 Architectures: amd64, arm64v8
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
-Directory: 9.0/jdk21/openjdk-slim-bookworm
+GitCommit: c6f2ca4467405fb3743452b648f63cae1c516791
+Directory: 9.0/jdk21/temurin-jammy
 
-Tags: 9.0.80-jdk21-openjdk-slim-bullseye, 9.0-jdk21-openjdk-slim-bullseye, 9-jdk21-openjdk-slim-bullseye
-Architectures: amd64, arm64v8
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
-Directory: 9.0/jdk21/openjdk-slim-bullseye
-
-Tags: 9.0.80-jre8-temurin-focal, 9.0-jre8-temurin-focal, 9-jre8-temurin-focal
+Tags: 9.0.81-jre8-temurin-focal, 9.0-jre8-temurin-focal, 9-jre8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jre8/temurin-focal
 
-Tags: 9.0.80-jre8-temurin-jammy, 9.0-jre8-temurin-jammy, 9-jre8-temurin-jammy, 9.0.80-jre8-temurin, 9.0-jre8-temurin, 9-jre8-temurin, 9.0.80-jre8, 9.0-jre8, 9-jre8
+Tags: 9.0.81-jre8-temurin-jammy, 9.0-jre8-temurin-jammy, 9-jre8-temurin-jammy, 9.0.81-jre8-temurin, 9.0-jre8-temurin, 9-jre8-temurin, 9.0.81-jre8, 9.0-jre8, 9-jre8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jre8/temurin-jammy
 
-Tags: 9.0.80-jre11-temurin-focal, 9.0-jre11-temurin-focal, 9-jre11-temurin-focal
+Tags: 9.0.81-jre11-temurin-focal, 9.0-jre11-temurin-focal, 9-jre11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jre11/temurin-focal
 
-Tags: 9.0.80-jre11-temurin-jammy, 9.0-jre11-temurin-jammy, 9-jre11-temurin-jammy, 9.0.80-jre11-temurin, 9.0-jre11-temurin, 9-jre11-temurin, 9.0.80-jre11, 9.0-jre11, 9-jre11
+Tags: 9.0.81-jre11-temurin-jammy, 9.0-jre11-temurin-jammy, 9-jre11-temurin-jammy, 9.0.81-jre11-temurin, 9.0-jre11-temurin, 9-jre11-temurin, 9.0.81-jre11, 9.0-jre11, 9-jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jre11/temurin-jammy
 
-Tags: 9.0.80-jre17-temurin-focal, 9.0-jre17-temurin-focal, 9-jre17-temurin-focal
+Tags: 9.0.81-jre17-temurin-focal, 9.0-jre17-temurin-focal, 9-jre17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jre17/temurin-focal
 
-Tags: 9.0.80-jre17-temurin-jammy, 9.0-jre17-temurin-jammy, 9-jre17-temurin-jammy, 9.0.80-jre17-temurin, 9.0-jre17-temurin, 9-jre17-temurin, 9.0.80-jre17, 9.0-jre17, 9-jre17
+Tags: 9.0.81-jre17-temurin-jammy, 9.0-jre17-temurin-jammy, 9-jre17-temurin-jammy, 9.0.81-jre17-temurin, 9.0-jre17-temurin, 9-jre17-temurin, 9.0.81-jre17, 9.0-jre17, 9-jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ad1ce61765fcc0421e91cf8ee0370c79eeaa7d79
+GitCommit: f9bbf1387bda2a3aa1aa1021f607250b40621408
 Directory: 9.0/jre17/temurin-jammy
 
-Tags: 10.1.13-jdk11-temurin-jammy, 10.1-jdk11-temurin-jammy, 10-jdk11-temurin-jammy, jdk11-temurin-jammy, 10.1.13-jdk11-temurin, 10.1-jdk11-temurin, 10-jdk11-temurin, jdk11-temurin, 10.1.13-jdk11, 10.1-jdk11, 10-jdk11, jdk11
+Tags: 9.0.81-jre21-temurin-jammy, 9.0-jre21-temurin-jammy, 9-jre21-temurin-jammy, 9.0.81-jre21-temurin, 9.0-jre21-temurin, 9-jre21-temurin, 9.0.81-jre21, 9.0-jre21, 9-jre21
+Architectures: amd64, arm64v8
+GitCommit: c6f2ca4467405fb3743452b648f63cae1c516791
+Directory: 9.0/jre21/temurin-jammy
+
+Tags: 10.1.14-jdk11-temurin-jammy, 10.1-jdk11-temurin-jammy, 10-jdk11-temurin-jammy, jdk11-temurin-jammy, 10.1.14-jdk11-temurin, 10.1-jdk11-temurin, 10-jdk11-temurin, jdk11-temurin, 10.1.14-jdk11, 10.1-jdk11, 10-jdk11, jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 4505ae69aa030beba88a68fe410866ee375a8fc0
+GitCommit: db586de2afc6dccc248d2f108654e954d50da15c
 Directory: 10.1/jdk11/temurin-jammy
 
-Tags: 10.1.13-jdk17-temurin-jammy, 10.1-jdk17-temurin-jammy, 10-jdk17-temurin-jammy, jdk17-temurin-jammy, 10.1.13-jdk17-temurin, 10.1-jdk17-temurin, 10-jdk17-temurin, jdk17-temurin, 10.1.13-jdk17, 10.1-jdk17, 10-jdk17, jdk17, 10.1.13, 10.1, 10, latest
+Tags: 10.1.14-jdk17-temurin-jammy, 10.1-jdk17-temurin-jammy, 10-jdk17-temurin-jammy, jdk17-temurin-jammy, 10.1.14-jdk17-temurin, 10.1-jdk17-temurin, 10-jdk17-temurin, jdk17-temurin, 10.1.14-jdk17, 10.1-jdk17, 10-jdk17, jdk17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 4505ae69aa030beba88a68fe410866ee375a8fc0
+GitCommit: db586de2afc6dccc248d2f108654e954d50da15c
 Directory: 10.1/jdk17/temurin-jammy
 
-Tags: 10.1.13-jdk21-openjdk-bookworm, 10.1-jdk21-openjdk-bookworm, 10-jdk21-openjdk-bookworm, jdk21-openjdk-bookworm, 10.1.13-jdk21-openjdk, 10.1-jdk21-openjdk, 10-jdk21-openjdk, jdk21-openjdk
+Tags: 10.1.14-jdk21-temurin-jammy, 10.1-jdk21-temurin-jammy, 10-jdk21-temurin-jammy, jdk21-temurin-jammy, 10.1.14-jdk21-temurin, 10.1-jdk21-temurin, 10-jdk21-temurin, jdk21-temurin, 10.1.14-jdk21, 10.1-jdk21, 10-jdk21, jdk21, 10.1.14, 10.1, 10, latest
 Architectures: amd64, arm64v8
-GitCommit: 4505ae69aa030beba88a68fe410866ee375a8fc0
-Directory: 10.1/jdk21/openjdk-bookworm
+GitCommit: 2fa4e03c16759c4578b3dcb6ce97d7265ed777ba
+Directory: 10.1/jdk21/temurin-jammy
 
-Tags: 10.1.13-jdk21-openjdk-slim-bookworm, 10.1-jdk21-openjdk-slim-bookworm, 10-jdk21-openjdk-slim-bookworm, jdk21-openjdk-slim-bookworm, 10.1.13-jdk21-openjdk-slim, 10.1-jdk21-openjdk-slim, 10-jdk21-openjdk-slim, jdk21-openjdk-slim
-Architectures: amd64, arm64v8
-GitCommit: 4505ae69aa030beba88a68fe410866ee375a8fc0
-Directory: 10.1/jdk21/openjdk-slim-bookworm
-
-Tags: 10.1.13-jre11-temurin-jammy, 10.1-jre11-temurin-jammy, 10-jre11-temurin-jammy, jre11-temurin-jammy, 10.1.13-jre11-temurin, 10.1-jre11-temurin, 10-jre11-temurin, jre11-temurin, 10.1.13-jre11, 10.1-jre11, 10-jre11, jre11
+Tags: 10.1.14-jre11-temurin-jammy, 10.1-jre11-temurin-jammy, 10-jre11-temurin-jammy, jre11-temurin-jammy, 10.1.14-jre11-temurin, 10.1-jre11-temurin, 10-jre11-temurin, jre11-temurin, 10.1.14-jre11, 10.1-jre11, 10-jre11, jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 4505ae69aa030beba88a68fe410866ee375a8fc0
+GitCommit: db586de2afc6dccc248d2f108654e954d50da15c
 Directory: 10.1/jre11/temurin-jammy
 
-Tags: 10.1.13-jre17-temurin-jammy, 10.1-jre17-temurin-jammy, 10-jre17-temurin-jammy, jre17-temurin-jammy, 10.1.13-jre17-temurin, 10.1-jre17-temurin, 10-jre17-temurin, jre17-temurin, 10.1.13-jre17, 10.1-jre17, 10-jre17, jre17
+Tags: 10.1.14-jre17-temurin-jammy, 10.1-jre17-temurin-jammy, 10-jre17-temurin-jammy, jre17-temurin-jammy, 10.1.14-jre17-temurin, 10.1-jre17-temurin, 10-jre17-temurin, jre17-temurin, 10.1.14-jre17, 10.1-jre17, 10-jre17, jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 4505ae69aa030beba88a68fe410866ee375a8fc0
+GitCommit: db586de2afc6dccc248d2f108654e954d50da15c
 Directory: 10.1/jre17/temurin-jammy
 
-Tags: 11.0.0-M11-jdk21-openjdk-bookworm, 11.0.0-jdk21-openjdk-bookworm, 11.0-jdk21-openjdk-bookworm, 11.0.0-M11-jdk21-openjdk, 11.0.0-jdk21-openjdk, 11.0-jdk21-openjdk
+Tags: 10.1.14-jre21-temurin-jammy, 10.1-jre21-temurin-jammy, 10-jre21-temurin-jammy, jre21-temurin-jammy, 10.1.14-jre21-temurin, 10.1-jre21-temurin, 10-jre21-temurin, jre21-temurin, 10.1.14-jre21, 10.1-jre21, 10-jre21, jre21
+Architectures: amd64, arm64v8
+GitCommit: 2fa4e03c16759c4578b3dcb6ce97d7265ed777ba
+Directory: 10.1/jre21/temurin-jammy
+
+Tags: 11.0.0-M12-jdk21-temurin-jammy, 11.0.0-jdk21-temurin-jammy, 11.0-jdk21-temurin-jammy, 11.0.0-M12-jdk21-temurin, 11.0.0-jdk21-temurin, 11.0-jdk21-temurin, 11.0.0-M12-jdk21, 11.0.0-jdk21, 11.0-jdk21, 11.0.0-M12, 11.0.0, 11.0
 Architectures: amd64, arm64v8
-GitCommit: b512285a7e12128f0da031b6b24f1a4c026e3306
-Directory: 11.0/jdk21/openjdk-bookworm
+GitCommit: a05ba2589539f88093aa53fc94cead6a17c97aa6
+Directory: 11.0/jdk21/temurin-jammy
 
-Tags: 11.0.0-M11-jdk21-openjdk-slim-bookworm, 11.0.0-jdk21-openjdk-slim-bookworm, 11.0-jdk21-openjdk-slim-bookworm, 11.0.0-M11-jdk21-openjdk-slim, 11.0.0-jdk21-openjdk-slim, 11.0-jdk21-openjdk-slim
+Tags: 11.0.0-M12-jre21-temurin-jammy, 11.0.0-jre21-temurin-jammy, 11.0-jre21-temurin-jammy, 11.0.0-M12-jre21-temurin, 11.0.0-jre21-temurin, 11.0-jre21-temurin, 11.0.0-M12-jre21, 11.0.0-jre21, 11.0-jre21
 Architectures: amd64, arm64v8
-GitCommit: b512285a7e12128f0da031b6b24f1a4c026e3306
-Directory: 11.0/jdk21/openjdk-slim-bookworm
+GitCommit: a05ba2589539f88093aa53fc94cead6a17c97aa6
+Directory: 11.0/jre21/temurin-jammy
diff --git a/_bashbrew-list b/_bashbrew-list
index 20509a6..07f074a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -17,12 +17,11 @@ tomcat:8-jdk17-corretto-al2
 tomcat:8-jdk17-temurin
 tomcat:8-jdk17-temurin-focal
 tomcat:8-jdk17-temurin-jammy
-tomcat:8-jdk21-openjdk
-tomcat:8-jdk21-openjdk-bookworm
-tomcat:8-jdk21-openjdk-bullseye
-tomcat:8-jdk21-openjdk-slim
-tomcat:8-jdk21-openjdk-slim-bookworm
-tomcat:8-jdk21-openjdk-slim-bullseye
+tomcat:8-jdk21
+tomcat:8-jdk21-corretto
+tomcat:8-jdk21-corretto-al2
+tomcat:8-jdk21-temurin
+tomcat:8-jdk21-temurin-jammy
 tomcat:8-jre8
 tomcat:8-jre8-temurin
 tomcat:8-jre8-temurin-focal
@@ -35,6 +34,9 @@ tomcat:8-jre17
 tomcat:8-jre17-temurin
 tomcat:8-jre17-temurin-focal
 tomcat:8-jre17-temurin-jammy
+tomcat:8-jre21
+tomcat:8-jre21-temurin
+tomcat:8-jre21-temurin-jammy
 tomcat:8.5
 tomcat:8.5-jdk8
 tomcat:8.5-jdk8-corretto
@@ -54,12 +56,11 @@ tomcat:8.5-jdk17-corretto-al2
 tomcat:8.5-jdk17-temurin
 tomcat:8.5-jdk17-temurin-focal
 tomcat:8.5-jdk17-temurin-jammy
-tomcat:8.5-jdk21-openjdk
-tomcat:8.5-jdk21-openjdk-bookworm
-tomcat:8.5-jdk21-openjdk-bullseye
-tomcat:8.5-jdk21-openjdk-slim
-tomcat:8.5-jdk21-openjdk-slim-bookworm
-tomcat:8.5-jdk21-openjdk-slim-bullseye
+tomcat:8.5-jdk21
+tomcat:8.5-jdk21-corretto
+tomcat:8.5-jdk21-corretto-al2
+tomcat:8.5-jdk21-temurin
+tomcat:8.5-jdk21-temurin-jammy
 tomcat:8.5-jre8
 tomcat:8.5-jre8-temurin
 tomcat:8.5-jre8-temurin-focal
@@ -72,43 +73,48 @@ tomcat:8.5-jre17
 tomcat:8.5-jre17-temurin
 tomcat:8.5-jre17-temurin-focal
 tomcat:8.5-jre17-temurin-jammy
-tomcat:8.5.93
-tomcat:8.5.93-jdk8
-tomcat:8.5.93-jdk8-corretto
-tomcat:8.5.93-jdk8-corretto-al2
-tomcat:8.5.93-jdk8-temurin
-tomcat:8.5.93-jdk8-temurin-focal
-tomcat:8.5.93-jdk8-temurin-jammy
-tomcat:8.5.93-jdk11
-tomcat:8.5.93-jdk11-corretto
-tomcat:8.5.93-jdk11-corretto-al2
-tomcat:8.5.93-jdk11-temurin
-tomcat:8.5.93-jdk11-temurin-focal
-tomcat:8.5.93-jdk11-temurin-jammy
-tomcat:8.5.93-jdk17
-tomcat:8.5.93-jdk17-corretto
-tomcat:8.5.93-jdk17-corretto-al2
-tomcat:8.5.93-jdk17-temurin
-tomcat:8.5.93-jdk17-temurin-focal
-tomcat:8.5.93-jdk17-temurin-jammy
-tomcat:8.5.93-jdk21-openjdk
-tomcat:8.5.93-jdk21-openjdk-bookworm
-tomcat:8.5.93-jdk21-openjdk-bullseye
-tomcat:8.5.93-jdk21-openjdk-slim
-tomcat:8.5.93-jdk21-openjdk-slim-bookworm
-tomcat:8.5.93-jdk21-openjdk-slim-bullseye
-tomcat:8.5.93-jre8
-tomcat:8.5.93-jre8-temurin
-tomcat:8.5.93-jre8-temurin-focal
-tomcat:8.5.93-jre8-temurin-jammy
-tomcat:8.5.93-jre11
-tomcat:8.5.93-jre11-temurin
-tomcat:8.5.93-jre11-temurin-focal
-tomcat:8.5.93-jre11-temurin-jammy
-tomcat:8.5.93-jre17
-tomcat:8.5.93-jre17-temurin
-tomcat:8.5.93-jre17-temurin-focal
-tomcat:8.5.93-jre17-temurin-jammy
+tomcat:8.5-jre21
+tomcat:8.5-jre21-temurin
+tomcat:8.5-jre21-temurin-jammy
+tomcat:8.5.94
+tomcat:8.5.94-jdk8
+tomcat:8.5.94-jdk8-corretto
+tomcat:8.5.94-jdk8-corretto-al2
+tomcat:8.5.94-jdk8-temurin
+tomcat:8.5.94-jdk8-temurin-focal
+tomcat:8.5.94-jdk8-temurin-jammy
+tomcat:8.5.94-jdk11
+tomcat:8.5.94-jdk11-corretto
+tomcat:8.5.94-jdk11-corretto-al2
+tomcat:8.5.94-jdk11-temurin
+tomcat:8.5.94-jdk11-temurin-focal
+tomcat:8.5.94-jdk11-temurin-jammy
+tomcat:8.5.94-jdk17
+tomcat:8.5.94-jdk17-corretto
+tomcat:8.5.94-jdk17-corretto-al2
+tomcat:8.5.94-jdk17-temurin
+tomcat:8.5.94-jdk17-temurin-focal
+tomcat:8.5.94-jdk17-temurin-jammy
+tomcat:8.5.94-jdk21
+tomcat:8.5.94-jdk21-corretto
+tomcat:8.5.94-jdk21-corretto-al2
+tomcat:8.5.94-jdk21-temurin
+tomcat:8.5.94-jdk21-temurin-jammy
+tomcat:8.5.94-jre8
+tomcat:8.5.94-jre8-temurin
+tomcat:8.5.94-jre8-temurin-focal
+tomcat:8.5.94-jre8-temurin-jammy
+tomcat:8.5.94-jre11
+tomcat:8.5.94-jre11-temurin
+tomcat:8.5.94-jre11-temurin-focal
+tomcat:8.5.94-jre11-temurin-jammy
+tomcat:8.5.94-jre17
+tomcat:8.5.94-jre17-temurin
+tomcat:8.5.94-jre17-temurin-focal
+tomcat:8.5.94-jre17-temurin-jammy
+tomcat:8.5.94-jre21
+tomcat:8.5.94-jre21-temurin
+tomcat:8.5.94-jre21-temurin-jammy
 tomcat:9
 tomcat:9-jdk8
 tomcat:9-jdk8-corretto
@@ -128,12 +134,11 @@ tomcat:9-jdk17-corretto-al2
 tomcat:9-jdk17-temurin
 tomcat:9-jdk17-temurin-focal
 tomcat:9-jdk17-temurin-jammy
-tomcat:9-jdk21-openjdk
-tomcat:9-jdk21-openjdk-bookworm
-tomcat:9-jdk21-openjdk-bullseye
-tomcat:9-jdk21-openjdk-slim
-tomcat:9-jdk21-openjdk-slim-bookworm
-tomcat:9-jdk21-openjdk-slim-bullseye
+tomcat:9-jdk21
+tomcat:9-jdk21-corretto
+tomcat:9-jdk21-corretto-al2
+tomcat:9-jdk21-temurin
+tomcat:9-jdk21-temurin-jammy
 tomcat:9-jre8
 tomcat:9-jre8-temurin
 tomcat:9-jre8-temurin-focal
@@ -146,6 +151,9 @@ tomcat:9-jre17
 tomcat:9-jre17-temurin
 tomcat:9-jre17-temurin-focal
 tomcat:9-jre17-temurin-jammy
+tomcat:9-jre21
+tomcat:9-jre21-temurin
+tomcat:9-jre21-temurin-jammy
 tomcat:9.0
 tomcat:9.0-jdk8
 tomcat:9.0-jdk8-corretto
@@ -165,12 +173,11 @@ tomcat:9.0-jdk17-corretto-al2
 tomcat:9.0-jdk17-temurin
 tomcat:9.0-jdk17-temurin-focal
 tomcat:9.0-jdk17-temurin-jammy
-tomcat:9.0-jdk21-openjdk
-tomcat:9.0-jdk21-openjdk-bookworm
-tomcat:9.0-jdk21-openjdk-bullseye
-tomcat:9.0-jdk21-openjdk-slim
-tomcat:9.0-jdk21-openjdk-slim-bookworm
-tomcat:9.0-jdk21-openjdk-slim-bullseye
+tomcat:9.0-jdk21
+tomcat:9.0-jdk21-corretto
+tomcat:9.0-jdk21-corretto-al2
+tomcat:9.0-jdk21-temurin
+tomcat:9.0-jdk21-temurin-jammy
 tomcat:9.0-jre8
 tomcat:9.0-jre8-temurin
 tomcat:9.0-jre8-temurin-focal
@@ -183,43 +190,48 @@ tomcat:9.0-jre17
 tomcat:9.0-jre17-temurin
 tomcat:9.0-jre17-temurin-focal
 tomcat:9.0-jre17-temurin-jammy
-tomcat:9.0.80
-tomcat:9.0.80-jdk8
-tomcat:9.0.80-jdk8-corretto
-tomcat:9.0.80-jdk8-corretto-al2
-tomcat:9.0.80-jdk8-temurin
-tomcat:9.0.80-jdk8-temurin-focal
-tomcat:9.0.80-jdk8-temurin-jammy
-tomcat:9.0.80-jdk11
-tomcat:9.0.80-jdk11-corretto
-tomcat:9.0.80-jdk11-corretto-al2
-tomcat:9.0.80-jdk11-temurin
-tomcat:9.0.80-jdk11-temurin-focal
-tomcat:9.0.80-jdk11-temurin-jammy
-tomcat:9.0.80-jdk17
-tomcat:9.0.80-jdk17-corretto
-tomcat:9.0.80-jdk17-corretto-al2
-tomcat:9.0.80-jdk17-temurin
-tomcat:9.0.80-jdk17-temurin-focal
-tomcat:9.0.80-jdk17-temurin-jammy
-tomcat:9.0.80-jdk21-openjdk
-tomcat:9.0.80-jdk21-openjdk-bookworm
-tomcat:9.0.80-jdk21-openjdk-bullseye
-tomcat:9.0.80-jdk21-openjdk-slim
-tomcat:9.0.80-jdk21-openjdk-slim-bookworm
-tomcat:9.0.80-jdk21-openjdk-slim-bullseye
-tomcat:9.0.80-jre8
-tomcat:9.0.80-jre8-temurin
-tomcat:9.0.80-jre8-temurin-focal
-tomcat:9.0.80-jre8-temurin-jammy
-tomcat:9.0.80-jre11
-tomcat:9.0.80-jre11-temurin
-tomcat:9.0.80-jre11-temurin-focal
-tomcat:9.0.80-jre11-temurin-jammy
-tomcat:9.0.80-jre17
-tomcat:9.0.80-jre17-temurin
-tomcat:9.0.80-jre17-temurin-focal
-tomcat:9.0.80-jre17-temurin-jammy
+tomcat:9.0-jre21
+tomcat:9.0-jre21-temurin
+tomcat:9.0-jre21-temurin-jammy
+tomcat:9.0.81
+tomcat:9.0.81-jdk8
+tomcat:9.0.81-jdk8-corretto
+tomcat:9.0.81-jdk8-corretto-al2
+tomcat:9.0.81-jdk8-temurin
+tomcat:9.0.81-jdk8-temurin-focal
+tomcat:9.0.81-jdk8-temurin-jammy
+tomcat:9.0.81-jdk11
+tomcat:9.0.81-jdk11-corretto
+tomcat:9.0.81-jdk11-corretto-al2
+tomcat:9.0.81-jdk11-temurin
+tomcat:9.0.81-jdk11-temurin-focal
+tomcat:9.0.81-jdk11-temurin-jammy
+tomcat:9.0.81-jdk17
+tomcat:9.0.81-jdk17-corretto
+tomcat:9.0.81-jdk17-corretto-al2
+tomcat:9.0.81-jdk17-temurin
+tomcat:9.0.81-jdk17-temurin-focal
+tomcat:9.0.81-jdk17-temurin-jammy
+tomcat:9.0.81-jdk21
+tomcat:9.0.81-jdk21-corretto
+tomcat:9.0.81-jdk21-corretto-al2
+tomcat:9.0.81-jdk21-temurin
+tomcat:9.0.81-jdk21-temurin-jammy
+tomcat:9.0.81-jre8
+tomcat:9.0.81-jre8-temurin
+tomcat:9.0.81-jre8-temurin-focal
+tomcat:9.0.81-jre8-temurin-jammy
+tomcat:9.0.81-jre11
+tomcat:9.0.81-jre11-temurin
+tomcat:9.0.81-jre11-temurin-focal
+tomcat:9.0.81-jre11-temurin-jammy
+tomcat:9.0.81-jre17
+tomcat:9.0.81-jre17-temurin
+tomcat:9.0.81-jre17-temurin-focal
+tomcat:9.0.81-jre17-temurin-jammy
+tomcat:9.0.81-jre21
+tomcat:9.0.81-jre21-temurin
+tomcat:9.0.81-jre21-temurin-jammy
 tomcat:10
 tomcat:10-jdk11
 tomcat:10-jdk11-temurin
@@ -227,16 +239,18 @@ tomcat:10-jdk11-temurin-jammy
 tomcat:10-jdk17
 tomcat:10-jdk17-temurin
 tomcat:10-jdk17-temurin-jammy
-tomcat:10-jdk21-openjdk
-tomcat:10-jdk21-openjdk-bookworm
-tomcat:10-jdk21-openjdk-slim
-tomcat:10-jdk21-openjdk-slim-bookworm
+tomcat:10-jdk21
+tomcat:10-jdk21-temurin
+tomcat:10-jdk21-temurin-jammy
 tomcat:10-jre11
 tomcat:10-jre11-temurin
 tomcat:10-jre11-temurin-jammy
 tomcat:10-jre17
 tomcat:10-jre17-temurin
 tomcat:10-jre17-temurin-jammy
+tomcat:10-jre21
+tomcat:10-jre21-temurin
+tomcat:10-jre21-temurin-jammy
 tomcat:10.1
 tomcat:10.1-jdk11
 tomcat:10.1-jdk11-temurin
@@ -244,59 +258,74 @@ tomcat:10.1-jdk11-temurin-jammy
 tomcat:10.1-jdk17
 tomcat:10.1-jdk17-temurin
 tomcat:10.1-jdk17-temurin-jammy
-tomcat:10.1-jdk21-openjdk
-tomcat:10.1-jdk21-openjdk-bookworm
-tomcat:10.1-jdk21-openjdk-slim
-tomcat:10.1-jdk21-openjdk-slim-bookworm
+tomcat:10.1-jdk21
+tomcat:10.1-jdk21-temurin
+tomcat:10.1-jdk21-temurin-jammy
 tomcat:10.1-jre11
 tomcat:10.1-jre11-temurin
 tomcat:10.1-jre11-temurin-jammy
 tomcat:10.1-jre17
 tomcat:10.1-jre17-temurin
 tomcat:10.1-jre17-temurin-jammy
-tomcat:10.1.13
-tomcat:10.1.13-jdk11
-tomcat:10.1.13-jdk11-temurin
-tomcat:10.1.13-jdk11-temurin-jammy
-tomcat:10.1.13-jdk17
-tomcat:10.1.13-jdk17-temurin
-tomcat:10.1.13-jdk17-temurin-jammy
-tomcat:10.1.13-jdk21-openjdk
-tomcat:10.1.13-jdk21-openjdk-bookworm
-tomcat:10.1.13-jdk21-openjdk-slim
-tomcat:10.1.13-jdk21-openjdk-slim-bookworm
-tomcat:10.1.13-jre11
-tomcat:10.1.13-jre11-temurin
-tomcat:10.1.13-jre11-temurin-jammy
-tomcat:10.1.13-jre17
-tomcat:10.1.13-jre17-temurin
-tomcat:10.1.13-jre17-temurin-jammy
-tomcat:11.0-jdk21-openjdk
-tomcat:11.0-jdk21-openjdk-bookworm
-tomcat:11.0-jdk21-openjdk-slim
-tomcat:11.0-jdk21-openjdk-slim-bookworm
-tomcat:11.0.0-M11-jdk21-openjdk
-tomcat:11.0.0-M11-jdk21-openjdk-bookworm
-tomcat:11.0.0-M11-jdk21-openjdk-slim
-tomcat:11.0.0-M11-jdk21-openjdk-slim-bookworm
-tomcat:11.0.0-jdk21-openjdk
-tomcat:11.0.0-jdk21-openjdk-bookworm
-tomcat:11.0.0-jdk21-openjdk-slim
-tomcat:11.0.0-jdk21-openjdk-slim-bookworm
+tomcat:10.1-jre21
+tomcat:10.1-jre21-temurin
+tomcat:10.1-jre21-temurin-jammy
+tomcat:10.1.14
+tomcat:10.1.14-jdk11
+tomcat:10.1.14-jdk11-temurin
+tomcat:10.1.14-jdk11-temurin-jammy
+tomcat:10.1.14-jdk17
+tomcat:10.1.14-jdk17-temurin
+tomcat:10.1.14-jdk17-temurin-jammy
+tomcat:10.1.14-jdk21
+tomcat:10.1.14-jdk21-temurin
+tomcat:10.1.14-jdk21-temurin-jammy
+tomcat:10.1.14-jre11
+tomcat:10.1.14-jre11-temurin
+tomcat:10.1.14-jre11-temurin-jammy
+tomcat:10.1.14-jre17
+tomcat:10.1.14-jre17-temurin
+tomcat:10.1.14-jre17-temurin-jammy
+tomcat:10.1.14-jre21
+tomcat:10.1.14-jre21-temurin
+tomcat:10.1.14-jre21-temurin-jammy
+tomcat:11.0
+tomcat:11.0-jdk21
+tomcat:11.0-jdk21-temurin
+tomcat:11.0-jdk21-temurin-jammy
+tomcat:11.0-jre21
+tomcat:11.0-jre21-temurin
+tomcat:11.0-jre21-temurin-jammy
+tomcat:11.0.0
+tomcat:11.0.0-M12
+tomcat:11.0.0-M12-jdk21
+tomcat:11.0.0-M12-jdk21-temurin
+tomcat:11.0.0-M12-jdk21-temurin-jammy
+tomcat:11.0.0-M12-jre21
+tomcat:11.0.0-M12-jre21-temurin
+tomcat:11.0.0-M12-jre21-temurin-jammy
+tomcat:11.0.0-jdk21
+tomcat:11.0.0-jdk21-temurin
+tomcat:11.0.0-jdk21-temurin-jammy
+tomcat:11.0.0-jre21
+tomcat:11.0.0-jre21-temurin
+tomcat:11.0.0-jre21-temurin-jammy
 tomcat:jdk11
 tomcat:jdk11-temurin
 tomcat:jdk11-temurin-jammy
 tomcat:jdk17
 tomcat:jdk17-temurin
 tomcat:jdk17-temurin-jammy
-tomcat:jdk21-openjdk
-tomcat:jdk21-openjdk-bookworm
-tomcat:jdk21-openjdk-slim
-tomcat:jdk21-openjdk-slim-bookworm
+tomcat:jdk21
+tomcat:jdk21-temurin
+tomcat:jdk21-temurin-jammy
 tomcat:jre11
 tomcat:jre11-temurin
 tomcat:jre11-temurin-jammy
 tomcat:jre17
 tomcat:jre17-temurin
 tomcat:jre17-temurin-jammy
+tomcat:jre21
+tomcat:jre21-temurin
+tomcat:jre21-temurin-jammy
 tomcat:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 6e1ebe4..f66df5a 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -6,17 +6,16 @@ tomcat:8-jdk11-temurin-focal
 tomcat:8-jdk11
 tomcat:8-jdk17-corretto
 tomcat:8-jdk17-temurin-focal
+tomcat:8-jdk17
+tomcat:8-jdk21-corretto
 tomcat:8
-tomcat:8-jdk21-openjdk
-tomcat:8-jdk21-openjdk-bullseye
-tomcat:8-jdk21-openjdk-slim
-tomcat:8-jdk21-openjdk-slim-bullseye
 tomcat:8-jre8-temurin-focal
 tomcat:8-jre8
 tomcat:8-jre11-temurin-focal
 tomcat:8-jre11
 tomcat:8-jre17-temurin-focal
 tomcat:8-jre17
+tomcat:8-jre21
 tomcat:9-jdk8-corretto
 tomcat:9-jdk8-temurin-focal
 tomcat:9-jdk8
@@ -25,22 +24,21 @@ tomcat:9-jdk11-temurin-focal
 tomcat:9-jdk11
 tomcat:9-jdk17-corretto
 tomcat:9-jdk17-temurin-focal
+tomcat:9-jdk17
+tomcat:9-jdk21-corretto
 tomcat:9
-tomcat:9-jdk21-openjdk
-tomcat:9-jdk21-openjdk-bullseye
-tomcat:9-jdk21-openjdk-slim
-tomcat:9-jdk21-openjdk-slim-bullseye
 tomcat:9-jre8-temurin-focal
 tomcat:9-jre8
 tomcat:9-jre11-temurin-focal
 tomcat:9-jre11
 tomcat:9-jre17-temurin-focal
 tomcat:9-jre17
+tomcat:9-jre21
 tomcat:jdk11
+tomcat:jdk17
 tomcat:latest
-tomcat:jdk21-openjdk
-tomcat:jdk21-openjdk-slim
 tomcat:jre11
 tomcat:jre17
-tomcat:11.0-jdk21-openjdk
-tomcat:11.0-jdk21-openjdk-slim
+tomcat:jre21
+tomcat:11.0
+tomcat:11.0-jre21
diff --git a/tomcat_11.0-jdk21-openjdk-slim/Dockerfile b/tomcat_11.0-jdk21-openjdk-slim/Dockerfile
deleted file mode 100644
index 7c5e496..0000000
diff --git a/tomcat_11.0-jdk21-openjdk/Dockerfile b/tomcat_11.0-jdk21-openjdk/Dockerfile
deleted file mode 100644
index 9da9bb1..0000000
diff --git a/tomcat_jre11/Dockerfile b/tomcat_11.0-jre21/Dockerfile
similarity index 74%
copy from tomcat_jre11/Dockerfile
copy to tomcat_11.0-jre21/Dockerfile
index 6767ac0..79d5f6e 100644
--- a/tomcat_jre11/Dockerfile
+++ b/tomcat_11.0-jre21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:11-jre-jammy
+FROM eclipse-temurin:21-jre-jammy
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -15,15 +15,15 @@ WORKDIR $CATALINA_HOME
 ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
 ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 
-# see https://www.apache.org/dist/tomcat/tomcat-10/KEYS
+# see https://www.apache.org/dist/tomcat/tomcat-11/KEYS
 # see also "versions.sh" (https://github.com/docker-library/tomcat/blob/master/versions.sh)
-ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
+ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
-ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.13
-ENV TOMCAT_SHA512 406c0c367ac6ad95bb724ecc3a3c340ad7ded8c62287d657811eeec496eaaca1f5add52d2f46111da1426ae67090c543f6deccfeb5fdf4bdae32f9b39e773265
+ENV TOMCAT_MAJOR 11
+ENV TOMCAT_VERSION 11.0.0-M12
+ENV TOMCAT_SHA512 1bb9f8b58ff58699e984432b7cfe170b186f4786f833d95d5409d7d4e431a6d1e478f027fa1124e68f99fa68322ec0893f3d055af069482e95db0fa3892eb910
 
-COPY --from=tomcat:10.1.13-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:11.0.0-M12-jdk21-temurin-jammy $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_jdk11/Dockerfile b/tomcat_11.0/Dockerfile
similarity index 93%
copy from tomcat_jdk11/Dockerfile
copy to tomcat_11.0/Dockerfile
index 750270c..aa76754 100644
--- a/tomcat_jdk11/Dockerfile
+++ b/tomcat_11.0/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:11-jdk-jammy
+FROM eclipse-temurin:21-jdk-jammy
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -15,13 +15,13 @@ WORKDIR $CATALINA_HOME
 ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
 ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 
-# see https://www.apache.org/dist/tomcat/tomcat-10/KEYS
+# see https://www.apache.org/dist/tomcat/tomcat-11/KEYS
 # see also "versions.sh" (https://github.com/docker-library/tomcat/blob/master/versions.sh)
-ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
+ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
-ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.13
-ENV TOMCAT_SHA512 406c0c367ac6ad95bb724ecc3a3c340ad7ded8c62287d657811eeec496eaaca1f5add52d2f46111da1426ae67090c543f6deccfeb5fdf4bdae32f9b39e773265
+ENV TOMCAT_MAJOR 11
+ENV TOMCAT_VERSION 11.0.0-M12
+ENV TOMCAT_SHA512 1bb9f8b58ff58699e984432b7cfe170b186f4786f833d95d5409d7d4e431a6d1e478f027fa1124e68f99fa68322ec0893f3d055af069482e95db0fa3892eb910
 
 RUN set -eux; \
 	\
diff --git a/tomcat_8-jdk11-corretto/Dockerfile b/tomcat_8-jdk11-corretto/Dockerfile
index 99a9d0a..17810b8 100644
--- a/tomcat_8-jdk11-corretto/Dockerfile
+++ b/tomcat_8-jdk11-corretto/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
 RUN set -eux; \
 	\
diff --git a/tomcat_8-jdk11-temurin-focal/Dockerfile b/tomcat_8-jdk11-temurin-focal/Dockerfile
index 5520a71..765c93d 100644
--- a/tomcat_8-jdk11-temurin-focal/Dockerfile
+++ b/tomcat_8-jdk11-temurin-focal/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
 RUN set -eux; \
 	\
diff --git a/tomcat_8-jdk11/Dockerfile b/tomcat_8-jdk11/Dockerfile
index 9f605b5..0fefbee 100644
--- a/tomcat_8-jdk11/Dockerfile
+++ b/tomcat_8-jdk11/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
 RUN set -eux; \
 	\
diff --git a/tomcat_8-jdk17-corretto/Dockerfile b/tomcat_8-jdk17-corretto/Dockerfile
index 8682271..ee04379 100644
--- a/tomcat_8-jdk17-corretto/Dockerfile
+++ b/tomcat_8-jdk17-corretto/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
 RUN set -eux; \
 	\
diff --git a/tomcat_8-jdk17-temurin-focal/Dockerfile b/tomcat_8-jdk17-temurin-focal/Dockerfile
index 7b8a212..50cace8 100644
--- a/tomcat_8-jdk17-temurin-focal/Dockerfile
+++ b/tomcat_8-jdk17-temurin-focal/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
 RUN set -eux; \
 	\
diff --git a/tomcat_8/Dockerfile b/tomcat_8-jdk17/Dockerfile
similarity index 97%
copy from tomcat_8/Dockerfile
copy to tomcat_8-jdk17/Dockerfile
index 5e2085a..7e9e8a5 100644
--- a/tomcat_8/Dockerfile
+++ b/tomcat_8-jdk17/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
 RUN set -eux; \
 	\
diff --git a/tomcat_8-jdk8-corretto/Dockerfile b/tomcat_8-jdk21-corretto/Dockerfile
similarity index 96%
copy from tomcat_8-jdk8-corretto/Dockerfile
copy to tomcat_8-jdk21-corretto/Dockerfile
index 78b9db5..4ce5e94 100644
--- a/tomcat_8-jdk8-corretto/Dockerfile
+++ b/tomcat_8-jdk21-corretto/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM amazoncorretto:8-al2-jdk
+FROM amazoncorretto:21-al2-jdk
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
 RUN set -eux; \
 	\
diff --git a/tomcat_8-jdk21-openjdk-bullseye/Dockerfile b/tomcat_8-jdk21-openjdk-bullseye/Dockerfile
deleted file mode 100644
index a4e1964..0000000
diff --git a/tomcat_8-jdk21-openjdk-slim-bullseye/Dockerfile b/tomcat_8-jdk21-openjdk-slim-bullseye/Dockerfile
deleted file mode 100644
index dc11e78..0000000
diff --git a/tomcat_8-jdk21-openjdk-slim/Dockerfile b/tomcat_8-jdk21-openjdk-slim/Dockerfile
deleted file mode 100644
index 79f1b90..0000000
diff --git a/tomcat_8-jdk21-openjdk/Dockerfile b/tomcat_8-jdk21-openjdk/Dockerfile
deleted file mode 100644
index 2e79def..0000000
diff --git a/tomcat_8-jdk8-corretto/Dockerfile b/tomcat_8-jdk8-corretto/Dockerfile
index 78b9db5..250003b 100644
--- a/tomcat_8-jdk8-corretto/Dockerfile
+++ b/tomcat_8-jdk8-corretto/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
 RUN set -eux; \
 	\
diff --git a/tomcat_8-jdk8-temurin-focal/Dockerfile b/tomcat_8-jdk8-temurin-focal/Dockerfile
index d40d987..16e8a4c 100644
--- a/tomcat_8-jdk8-temurin-focal/Dockerfile
+++ b/tomcat_8-jdk8-temurin-focal/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
 RUN set -eux; \
 	\
diff --git a/tomcat_8-jdk8/Dockerfile b/tomcat_8-jdk8/Dockerfile
index 61a19af..4003eaf 100644
--- a/tomcat_8-jdk8/Dockerfile
+++ b/tomcat_8-jdk8/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
 RUN set -eux; \
 	\
diff --git a/tomcat_8-jre11-temurin-focal/Dockerfile b/tomcat_8-jre11-temurin-focal/Dockerfile
index d72fd04..93ed4c4 100644
--- a/tomcat_8-jre11-temurin-focal/Dockerfile
+++ b/tomcat_8-jre11-temurin-focal/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
-COPY --from=tomcat:8.5.93-jdk11-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:8.5.94-jdk11-temurin-focal $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_8-jre11/Dockerfile b/tomcat_8-jre11/Dockerfile
index 5bee606..a5e7ab4 100644
--- a/tomcat_8-jre11/Dockerfile
+++ b/tomcat_8-jre11/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
-COPY --from=tomcat:8.5.93-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:8.5.94-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_8-jre17-temurin-focal/Dockerfile b/tomcat_8-jre17-temurin-focal/Dockerfile
index ae1e3fc..af2ad0f 100644
--- a/tomcat_8-jre17-temurin-focal/Dockerfile
+++ b/tomcat_8-jre17-temurin-focal/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
-COPY --from=tomcat:8.5.93-jdk17-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:8.5.94-jdk17-temurin-focal $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_8-jre17/Dockerfile b/tomcat_8-jre17/Dockerfile
index 034f27f..ea55824 100644
--- a/tomcat_8-jre17/Dockerfile
+++ b/tomcat_8-jre17/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
-COPY --from=tomcat:8.5.93-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:8.5.94-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_8-jre17-temurin-focal/Dockerfile b/tomcat_8-jre21/Dockerfile
similarity index 87%
copy from tomcat_8-jre17-temurin-focal/Dockerfile
copy to tomcat_8-jre21/Dockerfile
index ae1e3fc..6e9a69e 100644
--- a/tomcat_8-jre17-temurin-focal/Dockerfile
+++ b/tomcat_8-jre21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:17-jre-focal
+FROM eclipse-temurin:21-jre-jammy
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
-COPY --from=tomcat:8.5.93-jdk17-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:8.5.94-jdk21-temurin-jammy $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_8-jre8-temurin-focal/Dockerfile b/tomcat_8-jre8-temurin-focal/Dockerfile
index d1e50a4..1690ab2 100644
--- a/tomcat_8-jre8-temurin-focal/Dockerfile
+++ b/tomcat_8-jre8-temurin-focal/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
-COPY --from=tomcat:8.5.93-jdk8-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:8.5.94-jdk8-temurin-focal $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_8-jre8/Dockerfile b/tomcat_8-jre8/Dockerfile
index 8f1d29f..256065d 100644
--- a/tomcat_8-jre8/Dockerfile
+++ b/tomcat_8-jre8/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
-COPY --from=tomcat:8.5.93-jdk8-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:8.5.94-jdk8-temurin-jammy $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_8/Dockerfile b/tomcat_8/Dockerfile
index 5e2085a..76e98da 100644
--- a/tomcat_8/Dockerfile
+++ b/tomcat_8/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:17-jdk-jammy
+FROM eclipse-temurin:21-jdk-jammy
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 5C3C5F3E314C866292F359A8F3AD5C94A67F707E 765908099ACF92702C7D949BFA0C35EA8AA299F1 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.93
-ENV TOMCAT_SHA512 fdd9bd768c2c8b7f57c75f1a4863bd2bde55e8ea7c8b9cb81427ea8be652540bdcb1ff1cd625b9fb0dd48eb750ebef0f0244d12ac574998d5df3a0d339699bcc
+ENV TOMCAT_VERSION 8.5.94
+ENV TOMCAT_SHA512 bee5399a0fef6dea774ac2b99ebf58b69c67079c0e870698be3c7786c88e9a120cb073223d0508621585e13f509f3fade9d276cfadeb0692e09feeb5f7bb2cc9
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk11-corretto/Dockerfile b/tomcat_9-jdk11-corretto/Dockerfile
index 9692b15..1550f03 100644
--- a/tomcat_9-jdk11-corretto/Dockerfile
+++ b/tomcat_9-jdk11-corretto/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk11-temurin-focal/Dockerfile b/tomcat_9-jdk11-temurin-focal/Dockerfile
index b527ffc..007d9fc 100644
--- a/tomcat_9-jdk11-temurin-focal/Dockerfile
+++ b/tomcat_9-jdk11-temurin-focal/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk11/Dockerfile b/tomcat_9-jdk11/Dockerfile
index ee14ff8..a95a267 100644
--- a/tomcat_9-jdk11/Dockerfile
+++ b/tomcat_9-jdk11/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk17-corretto/Dockerfile b/tomcat_9-jdk17-corretto/Dockerfile
index beb0866..4ec80f9 100644
--- a/tomcat_9-jdk17-corretto/Dockerfile
+++ b/tomcat_9-jdk17-corretto/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk17-temurin-focal/Dockerfile b/tomcat_9-jdk17-temurin-focal/Dockerfile
index 335c0a2..ad0c640 100644
--- a/tomcat_9-jdk17-temurin-focal/Dockerfile
+++ b/tomcat_9-jdk17-temurin-focal/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9/Dockerfile b/tomcat_9-jdk17/Dockerfile
similarity index 96%
copy from tomcat_9/Dockerfile
copy to tomcat_9-jdk17/Dockerfile
index 99a78a8..150c4c8 100644
--- a/tomcat_9/Dockerfile
+++ b/tomcat_9-jdk17/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk17-corretto/Dockerfile b/tomcat_9-jdk21-corretto/Dockerfile
similarity index 96%
copy from tomcat_9-jdk17-corretto/Dockerfile
copy to tomcat_9-jdk21-corretto/Dockerfile
index beb0866..3abbc23 100644
--- a/tomcat_9-jdk17-corretto/Dockerfile
+++ b/tomcat_9-jdk21-corretto/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM amazoncorretto:17-al2-jdk
+FROM amazoncorretto:21-al2-jdk
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk21-openjdk-bullseye/Dockerfile b/tomcat_9-jdk21-openjdk-bullseye/Dockerfile
deleted file mode 100644
index 3e3c208..0000000
diff --git a/tomcat_9-jdk21-openjdk-slim-bullseye/Dockerfile b/tomcat_9-jdk21-openjdk-slim-bullseye/Dockerfile
deleted file mode 100644
index 01dfdcf..0000000
diff --git a/tomcat_9-jdk21-openjdk-slim/Dockerfile b/tomcat_9-jdk21-openjdk-slim/Dockerfile
deleted file mode 100644
index 2a7c60b..0000000
diff --git a/tomcat_9-jdk21-openjdk/Dockerfile b/tomcat_9-jdk21-openjdk/Dockerfile
deleted file mode 100644
index c7f1d52..0000000
diff --git a/tomcat_9-jdk8-corretto/Dockerfile b/tomcat_9-jdk8-corretto/Dockerfile
index f2273eb..a600de9 100644
--- a/tomcat_9-jdk8-corretto/Dockerfile
+++ b/tomcat_9-jdk8-corretto/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk8-temurin-focal/Dockerfile b/tomcat_9-jdk8-temurin-focal/Dockerfile
index 0775f38..85bab22 100644
--- a/tomcat_9-jdk8-temurin-focal/Dockerfile
+++ b/tomcat_9-jdk8-temurin-focal/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk8/Dockerfile b/tomcat_9-jdk8/Dockerfile
index 5ed0836..e4a2832 100644
--- a/tomcat_9-jdk8/Dockerfile
+++ b/tomcat_9-jdk8/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jre11-temurin-focal/Dockerfile b/tomcat_9-jre11-temurin-focal/Dockerfile
index a8bc847..09d7f05 100644
--- a/tomcat_9-jre11-temurin-focal/Dockerfile
+++ b/tomcat_9-jre11-temurin-focal/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
-COPY --from=tomcat:9.0.80-jdk11-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.81-jdk11-temurin-focal $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_9-jre11/Dockerfile b/tomcat_9-jre11/Dockerfile
index 1c9b7bd..b801e02 100644
--- a/tomcat_9-jre11/Dockerfile
+++ b/tomcat_9-jre11/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
-COPY --from=tomcat:9.0.80-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.81-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_9-jre17-temurin-focal/Dockerfile b/tomcat_9-jre17-temurin-focal/Dockerfile
index f82466e..56e1118 100644
--- a/tomcat_9-jre17-temurin-focal/Dockerfile
+++ b/tomcat_9-jre17-temurin-focal/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
-COPY --from=tomcat:9.0.80-jdk17-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.81-jdk17-temurin-focal $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_9-jre17/Dockerfile b/tomcat_9-jre17/Dockerfile
index 186e917..5b82b2a 100644
--- a/tomcat_9-jre17/Dockerfile
+++ b/tomcat_9-jre17/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
-COPY --from=tomcat:9.0.80-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.81-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_9-jre11-temurin-focal/Dockerfile b/tomcat_9-jre21/Dockerfile
similarity index 85%
copy from tomcat_9-jre11-temurin-focal/Dockerfile
copy to tomcat_9-jre21/Dockerfile
index a8bc847..5cd9afc 100644
--- a/tomcat_9-jre11-temurin-focal/Dockerfile
+++ b/tomcat_9-jre21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:11-jre-focal
+FROM eclipse-temurin:21-jre-jammy
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
-COPY --from=tomcat:9.0.80-jdk11-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.81-jdk21-temurin-jammy $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_9-jre8-temurin-focal/Dockerfile b/tomcat_9-jre8-temurin-focal/Dockerfile
index 819f285..b9a51dc 100644
--- a/tomcat_9-jre8-temurin-focal/Dockerfile
+++ b/tomcat_9-jre8-temurin-focal/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
-COPY --from=tomcat:9.0.80-jdk8-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.81-jdk8-temurin-focal $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_9-jre8/Dockerfile b/tomcat_9-jre8/Dockerfile
index 4280687..e916ddb 100644
--- a/tomcat_9-jre8/Dockerfile
+++ b/tomcat_9-jre8/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
-COPY --from=tomcat:9.0.80-jdk8-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.81-jdk8-temurin-jammy $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_9/Dockerfile b/tomcat_9/Dockerfile
index 99a78a8..dfa2582 100644
--- a/tomcat_9/Dockerfile
+++ b/tomcat_9/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:17-jdk-jammy
+FROM eclipse-temurin:21-jdk-jammy
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.80
-ENV TOMCAT_SHA512 24014441b0ccdd2dda238efa56e1a039476488943e6cf04f8a372a340a49dd21ce174ed68e2f5fcc43401e85fae6d00c5eac3d357653e91601737b6fa94476de
+ENV TOMCAT_VERSION 9.0.81
+ENV TOMCAT_SHA512 919957776addb26570f4c4cc2a65159409baf6b5851b3524cc07ffb7ede289ce00f454e547d309eb772e543eea0956201067e0a7b4627d182eff7e2ce042e298
 
 RUN set -eux; \
 	\
diff --git a/tomcat_jdk11/Dockerfile b/tomcat_jdk11/Dockerfile
index 750270c..ebcede6 100644
--- a/tomcat_jdk11/Dockerfile
+++ b/tomcat_jdk11/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.13
-ENV TOMCAT_SHA512 406c0c367ac6ad95bb724ecc3a3c340ad7ded8c62287d657811eeec496eaaca1f5add52d2f46111da1426ae67090c543f6deccfeb5fdf4bdae32f9b39e773265
+ENV TOMCAT_VERSION 10.1.14
+ENV TOMCAT_SHA512 53b7e8cc001686fe3893e00420b469c2d99f0065ee00d9e77e0f4eebdf41b77e69a2e5f27ce2dae2248116f5a78824144d7724c8dda1442b0796152cf7b09081
 
 RUN set -eux; \
 	\
diff --git a/tomcat_latest/Dockerfile b/tomcat_jdk17/Dockerfile
similarity index 96%
copy from tomcat_latest/Dockerfile
copy to tomcat_jdk17/Dockerfile
index 68a9f4c..f9b525b 100644
--- a/tomcat_latest/Dockerfile
+++ b/tomcat_jdk17/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.13
-ENV TOMCAT_SHA512 406c0c367ac6ad95bb724ecc3a3c340ad7ded8c62287d657811eeec496eaaca1f5add52d2f46111da1426ae67090c543f6deccfeb5fdf4bdae32f9b39e773265
+ENV TOMCAT_VERSION 10.1.14
+ENV TOMCAT_SHA512 53b7e8cc001686fe3893e00420b469c2d99f0065ee00d9e77e0f4eebdf41b77e69a2e5f27ce2dae2248116f5a78824144d7724c8dda1442b0796152cf7b09081
 
 RUN set -eux; \
 	\
diff --git a/tomcat_jdk21-openjdk-slim/Dockerfile b/tomcat_jdk21-openjdk-slim/Dockerfile
deleted file mode 100644
index af7af00..0000000
diff --git a/tomcat_jdk21-openjdk/Dockerfile b/tomcat_jdk21-openjdk/Dockerfile
deleted file mode 100644
index fbc8d78..0000000
diff --git a/tomcat_jre11/Dockerfile b/tomcat_jre11/Dockerfile
index 6767ac0..f676f8a 100644
--- a/tomcat_jre11/Dockerfile
+++ b/tomcat_jre11/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.13
-ENV TOMCAT_SHA512 406c0c367ac6ad95bb724ecc3a3c340ad7ded8c62287d657811eeec496eaaca1f5add52d2f46111da1426ae67090c543f6deccfeb5fdf4bdae32f9b39e773265
+ENV TOMCAT_VERSION 10.1.14
+ENV TOMCAT_SHA512 53b7e8cc001686fe3893e00420b469c2d99f0065ee00d9e77e0f4eebdf41b77e69a2e5f27ce2dae2248116f5a78824144d7724c8dda1442b0796152cf7b09081
 
-COPY --from=tomcat:10.1.13-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.14-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_jre17/Dockerfile b/tomcat_jre17/Dockerfile
index fca2abf..d1240e3 100644
--- a/tomcat_jre17/Dockerfile
+++ b/tomcat_jre17/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.13
-ENV TOMCAT_SHA512 406c0c367ac6ad95bb724ecc3a3c340ad7ded8c62287d657811eeec496eaaca1f5add52d2f46111da1426ae67090c543f6deccfeb5fdf4bdae32f9b39e773265
+ENV TOMCAT_VERSION 10.1.14
+ENV TOMCAT_SHA512 53b7e8cc001686fe3893e00420b469c2d99f0065ee00d9e77e0f4eebdf41b77e69a2e5f27ce2dae2248116f5a78824144d7724c8dda1442b0796152cf7b09081
 
-COPY --from=tomcat:10.1.13-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.14-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_jre11/Dockerfile b/tomcat_jre21/Dockerfile
similarity index 84%
copy from tomcat_jre11/Dockerfile
copy to tomcat_jre21/Dockerfile
index 6767ac0..b37aa9f 100644
--- a/tomcat_jre11/Dockerfile
+++ b/tomcat_jre21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:11-jre-jammy
+FROM eclipse-temurin:21-jre-jammy
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.13
-ENV TOMCAT_SHA512 406c0c367ac6ad95bb724ecc3a3c340ad7ded8c62287d657811eeec496eaaca1f5add52d2f46111da1426ae67090c543f6deccfeb5fdf4bdae32f9b39e773265
+ENV TOMCAT_VERSION 10.1.14
+ENV TOMCAT_SHA512 53b7e8cc001686fe3893e00420b469c2d99f0065ee00d9e77e0f4eebdf41b77e69a2e5f27ce2dae2248116f5a78824144d7724c8dda1442b0796152cf7b09081
 
-COPY --from=tomcat:10.1.13-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.14-jdk21-temurin-jammy $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_latest/Dockerfile b/tomcat_latest/Dockerfile
index 68a9f4c..d331988 100644
--- a/tomcat_latest/Dockerfile
+++ b/tomcat_latest/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:17-jdk-jammy
+FROM eclipse-temurin:21-jdk-jammy
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.13
-ENV TOMCAT_SHA512 406c0c367ac6ad95bb724ecc3a3c340ad7ded8c62287d657811eeec496eaaca1f5add52d2f46111da1426ae67090c543f6deccfeb5fdf4bdae32f9b39e773265
+ENV TOMCAT_VERSION 10.1.14
+ENV TOMCAT_SHA512 53b7e8cc001686fe3893e00420b469c2d99f0065ee00d9e77e0f4eebdf41b77e69a2e5f27ce2dae2248116f5a78824144d7724c8dda1442b0796152cf7b09081
 
 RUN set -eux; \
 	\

Relevant Maintainers:

@yosifkit
Copy link
Member Author

Yay, looks like eclipse-temurin was able to get JDK 21 published, so this one is good to go. We can continue deciding if corretto-al2023 is a good target in docker-library/tomcat#305.

@yosifkit yosifkit merged commit 2786088 into docker-library:master Oct 12, 2023
31 checks passed
@yosifkit yosifkit deleted the tomcat branch October 12, 2023 23:13
@yosifkit yosifkit mentioned this pull request Oct 13, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@whalelines whalelines whalelines left review comments

Assignees
No one assigned
Labels
library/tomcat
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yosifkit @whalelines @docker-library-bot