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.

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

Update tomcat #12837

Merged
merged 1 commit into from
Jul 21, 2022
Merged

Update tomcat #12837

merged 1 commit into from
Jul 21, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Jul 21, 2022

Changes:

Changes:

- docker-library/tomcat@1735880: Merge pull request docker-library/tomcat#272 from infosiftr/10.1.0-M17
- docker-library/tomcat@be77ba3: Update to 10.1.0-M17
- docker-library/tomcat@5c460f6: Update 9.0 to 9.0.65
- docker-library/tomcat@9975787: Merge pull request docker-library/tomcat#271 from infosiftr/with-ssl
- docker-library/tomcat@16c8038: Switch from "--with-ssl=yes" to "--with-ssl"
- docker-library/tomcat@37198ec: Update jq-template for speed improvements
@github-actions
Copy link

Diff for 07496f8:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index a3290e7..e3d081e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,89 +1,89 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/tomcat.git
 
-Tags: 8.5.81-jdk8-corretto, 8.5-jdk8-corretto, 8-jdk8-corretto
+Tags: 8.5.81-jdk8-corretto-al2, 8.5-jdk8-corretto-al2, 8-jdk8-corretto-al2, 8.5.81-jdk8-corretto, 8.5-jdk8-corretto, 8-jdk8-corretto
 Architectures: amd64, arm64v8
-GitCommit: 7020dbe200497e20901a5af67a61f8dffba26d91
-Directory: 8.5/jdk8/corretto
+GitCommit: be77ba3410933594589a61415d302686ab9798cb
+Directory: 8.5/jdk8/corretto-al2
 
 Tags: 8.5.81-jdk8-openjdk-bullseye, 8.5-jdk8-openjdk-bullseye, 8-jdk8-openjdk-bullseye, 8.5.81-jdk8-openjdk, 8.5-jdk8-openjdk, 8-jdk8-openjdk
 Architectures: amd64, arm64v8
-GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk8/openjdk-bullseye
 
 Tags: 8.5.81-jdk8-openjdk-buster, 8.5-jdk8-openjdk-buster, 8-jdk8-openjdk-buster
 Architectures: amd64, arm64v8
-GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk8/openjdk-buster
 
 Tags: 8.5.81-jdk8-openjdk-slim-bullseye, 8.5-jdk8-openjdk-slim-bullseye, 8-jdk8-openjdk-slim-bullseye, 8.5.81-jdk8-openjdk-slim, 8.5-jdk8-openjdk-slim, 8-jdk8-openjdk-slim
 Architectures: amd64, arm64v8
-GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk8/openjdk-slim-bullseye
 
 Tags: 8.5.81-jdk8-openjdk-slim-buster, 8.5-jdk8-openjdk-slim-buster, 8-jdk8-openjdk-slim-buster
 Architectures: amd64, arm64v8
-GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk8/openjdk-slim-buster
 
 Tags: 8.5.81-jdk8-temurin-focal, 8.5-jdk8-temurin-focal, 8-jdk8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk8/temurin-focal
 
 Tags: 8.5.81-jdk8-temurin-jammy, 8.5-jdk8-temurin-jammy, 8-jdk8-temurin-jammy, 8.5.81-jdk8-temurin, 8.5-jdk8-temurin, 8-jdk8-temurin, 8.5.81-jdk8, 8.5-jdk8, 8-jdk8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk8/temurin-jammy
 
-Tags: 8.5.81-jdk11-corretto, 8.5-jdk11-corretto, 8-jdk11-corretto
+Tags: 8.5.81-jdk11-corretto-al2, 8.5-jdk11-corretto-al2, 8-jdk11-corretto-al2, 8.5.81-jdk11-corretto, 8.5-jdk11-corretto, 8-jdk11-corretto
 Architectures: amd64, arm64v8
-GitCommit: 7020dbe200497e20901a5af67a61f8dffba26d91
-Directory: 8.5/jdk11/corretto
+GitCommit: be77ba3410933594589a61415d302686ab9798cb
+Directory: 8.5/jdk11/corretto-al2
 
 Tags: 8.5.81-jdk11-openjdk-bullseye, 8.5-jdk11-openjdk-bullseye, 8-jdk11-openjdk-bullseye, 8.5.81-jdk11-openjdk, 8.5-jdk11-openjdk, 8-jdk11-openjdk
 Architectures: amd64, arm64v8
-GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk11/openjdk-bullseye
 
 Tags: 8.5.81-jdk11-openjdk-buster, 8.5-jdk11-openjdk-buster, 8-jdk11-openjdk-buster
 Architectures: amd64, arm64v8
-GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk11/openjdk-buster
 
 Tags: 8.5.81-jdk11-openjdk-slim-bullseye, 8.5-jdk11-openjdk-slim-bullseye, 8-jdk11-openjdk-slim-bullseye, 8.5.81-jdk11-openjdk-slim, 8.5-jdk11-openjdk-slim, 8-jdk11-openjdk-slim
 Architectures: amd64, arm64v8
-GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk11/openjdk-slim-bullseye
 
 Tags: 8.5.81-jdk11-openjdk-slim-buster, 8.5-jdk11-openjdk-slim-buster, 8-jdk11-openjdk-slim-buster
 Architectures: amd64, arm64v8
-GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk11/openjdk-slim-buster
 
 Tags: 8.5.81-jdk11-temurin-focal, 8.5-jdk11-temurin-focal, 8-jdk11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk11/temurin-focal
 
 Tags: 8.5.81-jdk11-temurin-jammy, 8.5-jdk11-temurin-jammy, 8-jdk11-temurin-jammy, 8.5.81-jdk11-temurin, 8.5-jdk11-temurin, 8-jdk11-temurin, 8.5.81-jdk11, 8.5-jdk11, 8-jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk11/temurin-jammy
 
-Tags: 8.5.81-jdk17-corretto, 8.5-jdk17-corretto, 8-jdk17-corretto
+Tags: 8.5.81-jdk17-corretto-al2, 8.5-jdk17-corretto-al2, 8-jdk17-corretto-al2, 8.5.81-jdk17-corretto, 8.5-jdk17-corretto, 8-jdk17-corretto
 Architectures: amd64, arm64v8
-GitCommit: 7020dbe200497e20901a5af67a61f8dffba26d91
-Directory: 8.5/jdk17/corretto
+GitCommit: be77ba3410933594589a61415d302686ab9798cb
+Directory: 8.5/jdk17/corretto-al2
 
 Tags: 8.5.81-jdk17-temurin-focal, 8.5-jdk17-temurin-focal, 8-jdk17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk17/temurin-focal
 
 Tags: 8.5.81-jdk17-temurin-jammy, 8.5-jdk17-temurin-jammy, 8-jdk17-temurin-jammy, 8.5.81-jdk17-temurin, 8.5-jdk17-temurin, 8-jdk17-temurin, 8.5.81-jdk17, 8.5-jdk17, 8-jdk17, 8.5.81, 8.5, 8
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 8.5/jdk17/temurin-jammy
 
 Tags: 8.5.81-jre8-openjdk-bullseye, 8.5-jre8-openjdk-bullseye, 8-jre8-openjdk-bullseye, 8.5.81-jre8-openjdk, 8.5-jre8-openjdk, 8-jre8-openjdk
@@ -156,244 +156,244 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
 Directory: 8.5/jre17/temurin-jammy
 
-Tags: 9.0.64-jdk8-corretto, 9.0-jdk8-corretto, 9-jdk8-corretto
+Tags: 9.0.65-jdk8-corretto-al2, 9.0-jdk8-corretto-al2, 9-jdk8-corretto-al2, 9.0.65-jdk8-corretto, 9.0-jdk8-corretto, 9-jdk8-corretto
 Architectures: amd64, arm64v8
-GitCommit: 7020dbe200497e20901a5af67a61f8dffba26d91
-Directory: 9.0/jdk8/corretto
+GitCommit: be77ba3410933594589a61415d302686ab9798cb
+Directory: 9.0/jdk8/corretto-al2
 
-Tags: 9.0.64-jdk8-openjdk-bullseye, 9.0-jdk8-openjdk-bullseye, 9-jdk8-openjdk-bullseye, 9.0.64-jdk8-openjdk, 9.0-jdk8-openjdk, 9-jdk8-openjdk
+Tags: 9.0.65-jdk8-openjdk-bullseye, 9.0-jdk8-openjdk-bullseye, 9-jdk8-openjdk-bullseye, 9.0.65-jdk8-openjdk, 9.0-jdk8-openjdk, 9-jdk8-openjdk
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk8/openjdk-bullseye
 
-Tags: 9.0.64-jdk8-openjdk-buster, 9.0-jdk8-openjdk-buster, 9-jdk8-openjdk-buster
+Tags: 9.0.65-jdk8-openjdk-buster, 9.0-jdk8-openjdk-buster, 9-jdk8-openjdk-buster
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk8/openjdk-buster
 
-Tags: 9.0.64-jdk8-openjdk-slim-bullseye, 9.0-jdk8-openjdk-slim-bullseye, 9-jdk8-openjdk-slim-bullseye, 9.0.64-jdk8-openjdk-slim, 9.0-jdk8-openjdk-slim, 9-jdk8-openjdk-slim
+Tags: 9.0.65-jdk8-openjdk-slim-bullseye, 9.0-jdk8-openjdk-slim-bullseye, 9-jdk8-openjdk-slim-bullseye, 9.0.65-jdk8-openjdk-slim, 9.0-jdk8-openjdk-slim, 9-jdk8-openjdk-slim
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk8/openjdk-slim-bullseye
 
-Tags: 9.0.64-jdk8-openjdk-slim-buster, 9.0-jdk8-openjdk-slim-buster, 9-jdk8-openjdk-slim-buster
+Tags: 9.0.65-jdk8-openjdk-slim-buster, 9.0-jdk8-openjdk-slim-buster, 9-jdk8-openjdk-slim-buster
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk8/openjdk-slim-buster
 
-Tags: 9.0.64-jdk8-temurin-focal, 9.0-jdk8-temurin-focal, 9-jdk8-temurin-focal
+Tags: 9.0.65-jdk8-temurin-focal, 9.0-jdk8-temurin-focal, 9-jdk8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk8/temurin-focal
 
-Tags: 9.0.64-jdk8-temurin-jammy, 9.0-jdk8-temurin-jammy, 9-jdk8-temurin-jammy, 9.0.64-jdk8-temurin, 9.0-jdk8-temurin, 9-jdk8-temurin, 9.0.64-jdk8, 9.0-jdk8, 9-jdk8
+Tags: 9.0.65-jdk8-temurin-jammy, 9.0-jdk8-temurin-jammy, 9-jdk8-temurin-jammy, 9.0.65-jdk8-temurin, 9.0-jdk8-temurin, 9-jdk8-temurin, 9.0.65-jdk8, 9.0-jdk8, 9-jdk8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk8/temurin-jammy
 
-Tags: 9.0.64-jdk11-corretto, 9.0-jdk11-corretto, 9-jdk11-corretto
+Tags: 9.0.65-jdk11-corretto-al2, 9.0-jdk11-corretto-al2, 9-jdk11-corretto-al2, 9.0.65-jdk11-corretto, 9.0-jdk11-corretto, 9-jdk11-corretto
 Architectures: amd64, arm64v8
-GitCommit: 7020dbe200497e20901a5af67a61f8dffba26d91
-Directory: 9.0/jdk11/corretto
+GitCommit: be77ba3410933594589a61415d302686ab9798cb
+Directory: 9.0/jdk11/corretto-al2
 
-Tags: 9.0.64-jdk11-openjdk-bullseye, 9.0-jdk11-openjdk-bullseye, 9-jdk11-openjdk-bullseye, 9.0.64-jdk11-openjdk, 9.0-jdk11-openjdk, 9-jdk11-openjdk
+Tags: 9.0.65-jdk11-openjdk-bullseye, 9.0-jdk11-openjdk-bullseye, 9-jdk11-openjdk-bullseye, 9.0.65-jdk11-openjdk, 9.0-jdk11-openjdk, 9-jdk11-openjdk
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk11/openjdk-bullseye
 
-Tags: 9.0.64-jdk11-openjdk-buster, 9.0-jdk11-openjdk-buster, 9-jdk11-openjdk-buster
+Tags: 9.0.65-jdk11-openjdk-buster, 9.0-jdk11-openjdk-buster, 9-jdk11-openjdk-buster
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk11/openjdk-buster
 
-Tags: 9.0.64-jdk11-openjdk-slim-bullseye, 9.0-jdk11-openjdk-slim-bullseye, 9-jdk11-openjdk-slim-bullseye, 9.0.64-jdk11-openjdk-slim, 9.0-jdk11-openjdk-slim, 9-jdk11-openjdk-slim
+Tags: 9.0.65-jdk11-openjdk-slim-bullseye, 9.0-jdk11-openjdk-slim-bullseye, 9-jdk11-openjdk-slim-bullseye, 9.0.65-jdk11-openjdk-slim, 9.0-jdk11-openjdk-slim, 9-jdk11-openjdk-slim
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk11/openjdk-slim-bullseye
 
-Tags: 9.0.64-jdk11-openjdk-slim-buster, 9.0-jdk11-openjdk-slim-buster, 9-jdk11-openjdk-slim-buster
+Tags: 9.0.65-jdk11-openjdk-slim-buster, 9.0-jdk11-openjdk-slim-buster, 9-jdk11-openjdk-slim-buster
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk11/openjdk-slim-buster
 
-Tags: 9.0.64-jdk11-temurin-focal, 9.0-jdk11-temurin-focal, 9-jdk11-temurin-focal
+Tags: 9.0.65-jdk11-temurin-focal, 9.0-jdk11-temurin-focal, 9-jdk11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk11/temurin-focal
 
-Tags: 9.0.64-jdk11-temurin-jammy, 9.0-jdk11-temurin-jammy, 9-jdk11-temurin-jammy, 9.0.64-jdk11-temurin, 9.0-jdk11-temurin, 9-jdk11-temurin, 9.0.64-jdk11, 9.0-jdk11, 9-jdk11
+Tags: 9.0.65-jdk11-temurin-jammy, 9.0-jdk11-temurin-jammy, 9-jdk11-temurin-jammy, 9.0.65-jdk11-temurin, 9.0-jdk11-temurin, 9-jdk11-temurin, 9.0.65-jdk11, 9.0-jdk11, 9-jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk11/temurin-jammy
 
-Tags: 9.0.64-jdk17-corretto, 9.0-jdk17-corretto, 9-jdk17-corretto
+Tags: 9.0.65-jdk17-corretto-al2, 9.0-jdk17-corretto-al2, 9-jdk17-corretto-al2, 9.0.65-jdk17-corretto, 9.0-jdk17-corretto, 9-jdk17-corretto
 Architectures: amd64, arm64v8
-GitCommit: 7020dbe200497e20901a5af67a61f8dffba26d91
-Directory: 9.0/jdk17/corretto
+GitCommit: be77ba3410933594589a61415d302686ab9798cb
+Directory: 9.0/jdk17/corretto-al2
 
-Tags: 9.0.64-jdk17-temurin-focal, 9.0-jdk17-temurin-focal, 9-jdk17-temurin-focal
+Tags: 9.0.65-jdk17-temurin-focal, 9.0-jdk17-temurin-focal, 9-jdk17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk17/temurin-focal
 
-Tags: 9.0.64-jdk17-temurin-jammy, 9.0-jdk17-temurin-jammy, 9-jdk17-temurin-jammy, 9.0.64-jdk17-temurin, 9.0-jdk17-temurin, 9-jdk17-temurin, 9.0.64-jdk17, 9.0-jdk17, 9-jdk17, 9.0.64, 9.0, 9
+Tags: 9.0.65-jdk17-temurin-jammy, 9.0-jdk17-temurin-jammy, 9-jdk17-temurin-jammy, 9.0.65-jdk17-temurin, 9.0-jdk17-temurin, 9-jdk17-temurin, 9.0.65-jdk17, 9.0-jdk17, 9-jdk17, 9.0.65, 9.0, 9
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jdk17/temurin-jammy
 
-Tags: 9.0.64-jre8-openjdk-bullseye, 9.0-jre8-openjdk-bullseye, 9-jre8-openjdk-bullseye, 9.0.64-jre8-openjdk, 9.0-jre8-openjdk, 9-jre8-openjdk
+Tags: 9.0.65-jre8-openjdk-bullseye, 9.0-jre8-openjdk-bullseye, 9-jre8-openjdk-bullseye, 9.0.65-jre8-openjdk, 9.0-jre8-openjdk, 9-jre8-openjdk
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre8/openjdk-bullseye
 
-Tags: 9.0.64-jre8-openjdk-buster, 9.0-jre8-openjdk-buster, 9-jre8-openjdk-buster
+Tags: 9.0.65-jre8-openjdk-buster, 9.0-jre8-openjdk-buster, 9-jre8-openjdk-buster
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre8/openjdk-buster
 
-Tags: 9.0.64-jre8-openjdk-slim-bullseye, 9.0-jre8-openjdk-slim-bullseye, 9-jre8-openjdk-slim-bullseye, 9.0.64-jre8-openjdk-slim, 9.0-jre8-openjdk-slim, 9-jre8-openjdk-slim
+Tags: 9.0.65-jre8-openjdk-slim-bullseye, 9.0-jre8-openjdk-slim-bullseye, 9-jre8-openjdk-slim-bullseye, 9.0.65-jre8-openjdk-slim, 9.0-jre8-openjdk-slim, 9-jre8-openjdk-slim
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre8/openjdk-slim-bullseye
 
-Tags: 9.0.64-jre8-openjdk-slim-buster, 9.0-jre8-openjdk-slim-buster, 9-jre8-openjdk-slim-buster
+Tags: 9.0.65-jre8-openjdk-slim-buster, 9.0-jre8-openjdk-slim-buster, 9-jre8-openjdk-slim-buster
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre8/openjdk-slim-buster
 
-Tags: 9.0.64-jre8-temurin-focal, 9.0-jre8-temurin-focal, 9-jre8-temurin-focal
+Tags: 9.0.65-jre8-temurin-focal, 9.0-jre8-temurin-focal, 9-jre8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre8/temurin-focal
 
-Tags: 9.0.64-jre8-temurin-jammy, 9.0-jre8-temurin-jammy, 9-jre8-temurin-jammy, 9.0.64-jre8-temurin, 9.0-jre8-temurin, 9-jre8-temurin, 9.0.64-jre8, 9.0-jre8, 9-jre8
+Tags: 9.0.65-jre8-temurin-jammy, 9.0-jre8-temurin-jammy, 9-jre8-temurin-jammy, 9.0.65-jre8-temurin, 9.0-jre8-temurin, 9-jre8-temurin, 9.0.65-jre8, 9.0-jre8, 9-jre8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre8/temurin-jammy
 
-Tags: 9.0.64-jre11-openjdk-bullseye, 9.0-jre11-openjdk-bullseye, 9-jre11-openjdk-bullseye, 9.0.64-jre11-openjdk, 9.0-jre11-openjdk, 9-jre11-openjdk
+Tags: 9.0.65-jre11-openjdk-bullseye, 9.0-jre11-openjdk-bullseye, 9-jre11-openjdk-bullseye, 9.0.65-jre11-openjdk, 9.0-jre11-openjdk, 9-jre11-openjdk
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre11/openjdk-bullseye
 
-Tags: 9.0.64-jre11-openjdk-buster, 9.0-jre11-openjdk-buster, 9-jre11-openjdk-buster
+Tags: 9.0.65-jre11-openjdk-buster, 9.0-jre11-openjdk-buster, 9-jre11-openjdk-buster
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre11/openjdk-buster
 
-Tags: 9.0.64-jre11-openjdk-slim-bullseye, 9.0-jre11-openjdk-slim-bullseye, 9-jre11-openjdk-slim-bullseye, 9.0.64-jre11-openjdk-slim, 9.0-jre11-openjdk-slim, 9-jre11-openjdk-slim
+Tags: 9.0.65-jre11-openjdk-slim-bullseye, 9.0-jre11-openjdk-slim-bullseye, 9-jre11-openjdk-slim-bullseye, 9.0.65-jre11-openjdk-slim, 9.0-jre11-openjdk-slim, 9-jre11-openjdk-slim
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre11/openjdk-slim-bullseye
 
-Tags: 9.0.64-jre11-openjdk-slim-buster, 9.0-jre11-openjdk-slim-buster, 9-jre11-openjdk-slim-buster
+Tags: 9.0.65-jre11-openjdk-slim-buster, 9.0-jre11-openjdk-slim-buster, 9-jre11-openjdk-slim-buster
 Architectures: amd64, arm64v8
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre11/openjdk-slim-buster
 
-Tags: 9.0.64-jre11-temurin-focal, 9.0-jre11-temurin-focal, 9-jre11-temurin-focal
+Tags: 9.0.65-jre11-temurin-focal, 9.0-jre11-temurin-focal, 9-jre11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre11/temurin-focal
 
-Tags: 9.0.64-jre11-temurin-jammy, 9.0-jre11-temurin-jammy, 9-jre11-temurin-jammy, 9.0.64-jre11-temurin, 9.0-jre11-temurin, 9-jre11-temurin, 9.0.64-jre11, 9.0-jre11, 9-jre11
+Tags: 9.0.65-jre11-temurin-jammy, 9.0-jre11-temurin-jammy, 9-jre11-temurin-jammy, 9.0.65-jre11-temurin, 9.0-jre11-temurin, 9-jre11-temurin, 9.0.65-jre11, 9.0-jre11, 9-jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre11/temurin-jammy
 
-Tags: 9.0.64-jre17-temurin-focal, 9.0-jre17-temurin-focal, 9-jre17-temurin-focal
+Tags: 9.0.65-jre17-temurin-focal, 9.0-jre17-temurin-focal, 9-jre17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre17/temurin-focal
 
-Tags: 9.0.64-jre17-temurin-jammy, 9.0-jre17-temurin-jammy, 9-jre17-temurin-jammy, 9.0.64-jre17-temurin, 9.0-jre17-temurin, 9-jre17-temurin, 9.0.64-jre17, 9.0-jre17, 9-jre17
+Tags: 9.0.65-jre17-temurin-jammy, 9.0-jre17-temurin-jammy, 9-jre17-temurin-jammy, 9.0.65-jre17-temurin, 9.0-jre17-temurin, 9-jre17-temurin, 9.0.65-jre17, 9.0-jre17, 9-jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: 5c460f60cc7491c21815944b5405cd522e925997
 Directory: 9.0/jre17/temurin-jammy
 
-Tags: 10.0.22-jdk8-corretto, 10.0-jdk8-corretto, 10-jdk8-corretto, jdk8-corretto
+Tags: 10.0.22-jdk8-corretto-al2, 10.0-jdk8-corretto-al2, 10-jdk8-corretto-al2, jdk8-corretto-al2, 10.0.22-jdk8-corretto, 10.0-jdk8-corretto, 10-jdk8-corretto, jdk8-corretto
 Architectures: amd64, arm64v8
-GitCommit: 7020dbe200497e20901a5af67a61f8dffba26d91
-Directory: 10.0/jdk8/corretto
+GitCommit: be77ba3410933594589a61415d302686ab9798cb
+Directory: 10.0/jdk8/corretto-al2
 
 Tags: 10.0.22-jdk8-openjdk-bullseye, 10.0-jdk8-openjdk-bullseye, 10-jdk8-openjdk-bullseye, jdk8-openjdk-bullseye, 10.0.22-jdk8-openjdk, 10.0-jdk8-openjdk, 10-jdk8-openjdk, jdk8-openjdk
 Architectures: amd64, arm64v8
-GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk8/openjdk-bullseye
 
 Tags: 10.0.22-jdk8-openjdk-buster, 10.0-jdk8-openjdk-buster, 10-jdk8-openjdk-buster, jdk8-openjdk-buster
 Architectures: amd64, arm64v8
-GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk8/openjdk-buster
 
 Tags: 10.0.22-jdk8-openjdk-slim-bullseye, 10.0-jdk8-openjdk-slim-bullseye, 10-jdk8-openjdk-slim-bullseye, jdk8-openjdk-slim-bullseye, 10.0.22-jdk8-openjdk-slim, 10.0-jdk8-openjdk-slim, 10-jdk8-openjdk-slim, jdk8-openjdk-slim
 Architectures: amd64, arm64v8
-GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk8/openjdk-slim-bullseye
 
 Tags: 10.0.22-jdk8-openjdk-slim-buster, 10.0-jdk8-openjdk-slim-buster, 10-jdk8-openjdk-slim-buster, jdk8-openjdk-slim-buster
 Architectures: amd64, arm64v8
-GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk8/openjdk-slim-buster
 
 Tags: 10.0.22-jdk8-temurin-focal, 10.0-jdk8-temurin-focal, 10-jdk8-temurin-focal, jdk8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk8/temurin-focal
 
 Tags: 10.0.22-jdk8-temurin-jammy, 10.0-jdk8-temurin-jammy, 10-jdk8-temurin-jammy, jdk8-temurin-jammy, 10.0.22-jdk8-temurin, 10.0-jdk8-temurin, 10-jdk8-temurin, jdk8-temurin, 10.0.22-jdk8, 10.0-jdk8, 10-jdk8, jdk8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk8/temurin-jammy
 
-Tags: 10.0.22-jdk11-corretto, 10.0-jdk11-corretto, 10-jdk11-corretto, jdk11-corretto
+Tags: 10.0.22-jdk11-corretto-al2, 10.0-jdk11-corretto-al2, 10-jdk11-corretto-al2, jdk11-corretto-al2, 10.0.22-jdk11-corretto, 10.0-jdk11-corretto, 10-jdk11-corretto, jdk11-corretto
 Architectures: amd64, arm64v8
-GitCommit: 7020dbe200497e20901a5af67a61f8dffba26d91
-Directory: 10.0/jdk11/corretto
+GitCommit: be77ba3410933594589a61415d302686ab9798cb
+Directory: 10.0/jdk11/corretto-al2
 
 Tags: 10.0.22-jdk11-openjdk-bullseye, 10.0-jdk11-openjdk-bullseye, 10-jdk11-openjdk-bullseye, jdk11-openjdk-bullseye, 10.0.22-jdk11-openjdk, 10.0-jdk11-openjdk, 10-jdk11-openjdk, jdk11-openjdk
 Architectures: amd64, arm64v8
-GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk11/openjdk-bullseye
 
 Tags: 10.0.22-jdk11-openjdk-buster, 10.0-jdk11-openjdk-buster, 10-jdk11-openjdk-buster, jdk11-openjdk-buster
 Architectures: amd64, arm64v8
-GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk11/openjdk-buster
 
 Tags: 10.0.22-jdk11-openjdk-slim-bullseye, 10.0-jdk11-openjdk-slim-bullseye, 10-jdk11-openjdk-slim-bullseye, jdk11-openjdk-slim-bullseye, 10.0.22-jdk11-openjdk-slim, 10.0-jdk11-openjdk-slim, 10-jdk11-openjdk-slim, jdk11-openjdk-slim
 Architectures: amd64, arm64v8
-GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk11/openjdk-slim-bullseye
 
 Tags: 10.0.22-jdk11-openjdk-slim-buster, 10.0-jdk11-openjdk-slim-buster, 10-jdk11-openjdk-slim-buster, jdk11-openjdk-slim-buster
 Architectures: amd64, arm64v8
-GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk11/openjdk-slim-buster
 
 Tags: 10.0.22-jdk11-temurin-focal, 10.0-jdk11-temurin-focal, 10-jdk11-temurin-focal, jdk11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk11/temurin-focal
 
 Tags: 10.0.22-jdk11-temurin-jammy, 10.0-jdk11-temurin-jammy, 10-jdk11-temurin-jammy, jdk11-temurin-jammy, 10.0.22-jdk11-temurin, 10.0-jdk11-temurin, 10-jdk11-temurin, jdk11-temurin, 10.0.22-jdk11, 10.0-jdk11, 10-jdk11, jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk11/temurin-jammy
 
-Tags: 10.0.22-jdk17-corretto, 10.0-jdk17-corretto, 10-jdk17-corretto, jdk17-corretto
+Tags: 10.0.22-jdk17-corretto-al2, 10.0-jdk17-corretto-al2, 10-jdk17-corretto-al2, jdk17-corretto-al2, 10.0.22-jdk17-corretto, 10.0-jdk17-corretto, 10-jdk17-corretto, jdk17-corretto
 Architectures: amd64, arm64v8
-GitCommit: 7020dbe200497e20901a5af67a61f8dffba26d91
-Directory: 10.0/jdk17/corretto
+GitCommit: be77ba3410933594589a61415d302686ab9798cb
+Directory: 10.0/jdk17/corretto-al2
 
 Tags: 10.0.22-jdk17-temurin-focal, 10.0-jdk17-temurin-focal, 10-jdk17-temurin-focal, jdk17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk17/temurin-focal
 
 Tags: 10.0.22-jdk17-temurin-jammy, 10.0-jdk17-temurin-jammy, 10-jdk17-temurin-jammy, jdk17-temurin-jammy, 10.0.22-jdk17-temurin, 10.0-jdk17-temurin, 10-jdk17-temurin, jdk17-temurin, 10.0.22-jdk17, 10.0-jdk17, 10-jdk17, jdk17, 10.0.22, 10.0, 10, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: 16c8038d964a10702bf00b337d00399d6e962475
 Directory: 10.0/jdk17/temurin-jammy
 
 Tags: 10.0.22-jre8-openjdk-bullseye, 10.0-jre8-openjdk-bullseye, 10-jre8-openjdk-bullseye, jre8-openjdk-bullseye, 10.0.22-jre8-openjdk, 10.0-jre8-openjdk, 10-jre8-openjdk, jre8-openjdk
@@ -466,92 +466,22 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
 Directory: 10.0/jre17/temurin-jammy
 
-Tags: 10.1.0-M16-jdk11-corretto, 10.1.0-jdk11-corretto, 10.1-jdk11-corretto
-Architectures: amd64, arm64v8
-GitCommit: 7020dbe200497e20901a5af67a61f8dffba26d91
-Directory: 10.1/jdk11/corretto
-
-Tags: 10.1.0-M16-jdk11-openjdk-bullseye, 10.1.0-jdk11-openjdk-bullseye, 10.1-jdk11-openjdk-bullseye, 10.1.0-M16-jdk11-openjdk, 10.1.0-jdk11-openjdk, 10.1-jdk11-openjdk
-Architectures: amd64, arm64v8
-GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
-Directory: 10.1/jdk11/openjdk-bullseye
-
-Tags: 10.1.0-M16-jdk11-openjdk-buster, 10.1.0-jdk11-openjdk-buster, 10.1-jdk11-openjdk-buster
-Architectures: amd64, arm64v8
-GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
-Directory: 10.1/jdk11/openjdk-buster
-
-Tags: 10.1.0-M16-jdk11-openjdk-slim-bullseye, 10.1.0-jdk11-openjdk-slim-bullseye, 10.1-jdk11-openjdk-slim-bullseye, 10.1.0-M16-jdk11-openjdk-slim, 10.1.0-jdk11-openjdk-slim, 10.1-jdk11-openjdk-slim
-Architectures: amd64, arm64v8
-GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
-Directory: 10.1/jdk11/openjdk-slim-bullseye
-
-Tags: 10.1.0-M16-jdk11-openjdk-slim-buster, 10.1.0-jdk11-openjdk-slim-buster, 10.1-jdk11-openjdk-slim-buster
-Architectures: amd64, arm64v8
-GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
-Directory: 10.1/jdk11/openjdk-slim-buster
-
-Tags: 10.1.0-M16-jdk11-temurin-focal, 10.1.0-jdk11-temurin-focal, 10.1-jdk11-temurin-focal
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
-Directory: 10.1/jdk11/temurin-focal
-
-Tags: 10.1.0-M16-jdk11-temurin-jammy, 10.1.0-jdk11-temurin-jammy, 10.1-jdk11-temurin-jammy, 10.1.0-M16-jdk11-temurin, 10.1.0-jdk11-temurin, 10.1-jdk11-temurin, 10.1.0-M16-jdk11, 10.1.0-jdk11, 10.1-jdk11
+Tags: 10.1.0-M17-jdk11-temurin-jammy, 10.1.0-jdk11-temurin-jammy, 10.1-jdk11-temurin-jammy, 10.1.0-M17-jdk11-temurin, 10.1.0-jdk11-temurin, 10.1-jdk11-temurin, 10.1.0-M17-jdk11, 10.1.0-jdk11, 10.1-jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: be77ba3410933594589a61415d302686ab9798cb
 Directory: 10.1/jdk11/temurin-jammy
 
-Tags: 10.1.0-M16-jdk17-corretto, 10.1.0-jdk17-corretto, 10.1-jdk17-corretto
-Architectures: amd64, arm64v8
-GitCommit: 7020dbe200497e20901a5af67a61f8dffba26d91
-Directory: 10.1/jdk17/corretto
-
-Tags: 10.1.0-M16-jdk17-temurin-focal, 10.1.0-jdk17-temurin-focal, 10.1-jdk17-temurin-focal
+Tags: 10.1.0-M17-jdk17-temurin-jammy, 10.1.0-jdk17-temurin-jammy, 10.1-jdk17-temurin-jammy, 10.1.0-M17-jdk17-temurin, 10.1.0-jdk17-temurin, 10.1-jdk17-temurin, 10.1.0-M17-jdk17, 10.1.0-jdk17, 10.1-jdk17, 10.1.0-M17, 10.1.0, 10.1
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
-Directory: 10.1/jdk17/temurin-focal
-
-Tags: 10.1.0-M16-jdk17-temurin-jammy, 10.1.0-jdk17-temurin-jammy, 10.1-jdk17-temurin-jammy, 10.1.0-M16-jdk17-temurin, 10.1.0-jdk17-temurin, 10.1-jdk17-temurin, 10.1.0-M16-jdk17, 10.1.0-jdk17, 10.1-jdk17, 10.1.0-M16, 10.1.0, 10.1
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: be77ba3410933594589a61415d302686ab9798cb
 Directory: 10.1/jdk17/temurin-jammy
 
-Tags: 10.1.0-M16-jre11-openjdk-bullseye, 10.1.0-jre11-openjdk-bullseye, 10.1-jre11-openjdk-bullseye, 10.1.0-M16-jre11-openjdk, 10.1.0-jre11-openjdk, 10.1-jre11-openjdk
-Architectures: amd64, arm64v8
-GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
-Directory: 10.1/jre11/openjdk-bullseye
-
-Tags: 10.1.0-M16-jre11-openjdk-buster, 10.1.0-jre11-openjdk-buster, 10.1-jre11-openjdk-buster
-Architectures: amd64, arm64v8
-GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
-Directory: 10.1/jre11/openjdk-buster
-
-Tags: 10.1.0-M16-jre11-openjdk-slim-bullseye, 10.1.0-jre11-openjdk-slim-bullseye, 10.1-jre11-openjdk-slim-bullseye, 10.1.0-M16-jre11-openjdk-slim, 10.1.0-jre11-openjdk-slim, 10.1-jre11-openjdk-slim
-Architectures: amd64, arm64v8
-GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
-Directory: 10.1/jre11/openjdk-slim-bullseye
-
-Tags: 10.1.0-M16-jre11-openjdk-slim-buster, 10.1.0-jre11-openjdk-slim-buster, 10.1-jre11-openjdk-slim-buster
-Architectures: amd64, arm64v8
-GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
-Directory: 10.1/jre11/openjdk-slim-buster
-
-Tags: 10.1.0-M16-jre11-temurin-focal, 10.1.0-jre11-temurin-focal, 10.1-jre11-temurin-focal
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
-Directory: 10.1/jre11/temurin-focal
-
-Tags: 10.1.0-M16-jre11-temurin-jammy, 10.1.0-jre11-temurin-jammy, 10.1-jre11-temurin-jammy, 10.1.0-M16-jre11-temurin, 10.1.0-jre11-temurin, 10.1-jre11-temurin, 10.1.0-M16-jre11, 10.1.0-jre11, 10.1-jre11
+Tags: 10.1.0-M17-jre11-temurin-jammy, 10.1.0-jre11-temurin-jammy, 10.1-jre11-temurin-jammy, 10.1.0-M17-jre11-temurin, 10.1.0-jre11-temurin, 10.1-jre11-temurin, 10.1.0-M17-jre11, 10.1.0-jre11, 10.1-jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: be77ba3410933594589a61415d302686ab9798cb
 Directory: 10.1/jre11/temurin-jammy
 
-Tags: 10.1.0-M16-jre17-temurin-focal, 10.1.0-jre17-temurin-focal, 10.1-jre17-temurin-focal
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
-Directory: 10.1/jre17/temurin-focal
-
-Tags: 10.1.0-M16-jre17-temurin-jammy, 10.1.0-jre17-temurin-jammy, 10.1-jre17-temurin-jammy, 10.1.0-M16-jre17-temurin, 10.1.0-jre17-temurin, 10.1-jre17-temurin, 10.1.0-M16-jre17, 10.1.0-jre17, 10.1-jre17
+Tags: 10.1.0-M17-jre17-temurin-jammy, 10.1.0-jre17-temurin-jammy, 10.1-jre17-temurin-jammy, 10.1.0-M17-jre17-temurin, 10.1.0-jre17-temurin, 10.1-jre17-temurin, 10.1.0-M17-jre17, 10.1.0-jre17, 10.1-jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 989632e026e7554a580ed1452d1ee4460c78e3be
+GitCommit: be77ba3410933594589a61415d302686ab9798cb
 Directory: 10.1/jre17/temurin-jammy
diff --git a/_bashbrew-list b/_bashbrew-list
index aed14e2..d930a67 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,7 @@
 tomcat:8
 tomcat:8-jdk8
 tomcat:8-jdk8-corretto
+tomcat:8-jdk8-corretto-al2
 tomcat:8-jdk8-openjdk
 tomcat:8-jdk8-openjdk-bullseye
 tomcat:8-jdk8-openjdk-buster
@@ -12,6 +13,7 @@ tomcat:8-jdk8-temurin-focal
 tomcat:8-jdk8-temurin-jammy
 tomcat:8-jdk11
 tomcat:8-jdk11-corretto
+tomcat:8-jdk11-corretto-al2
 tomcat:8-jdk11-openjdk
 tomcat:8-jdk11-openjdk-bullseye
 tomcat:8-jdk11-openjdk-buster
@@ -23,6 +25,7 @@ tomcat:8-jdk11-temurin-focal
 tomcat:8-jdk11-temurin-jammy
 tomcat:8-jdk17
 tomcat:8-jdk17-corretto
+tomcat:8-jdk17-corretto-al2
 tomcat:8-jdk17-temurin
 tomcat:8-jdk17-temurin-focal
 tomcat:8-jdk17-temurin-jammy
@@ -53,6 +56,7 @@ tomcat:8-jre17-temurin-jammy
 tomcat:8.5
 tomcat:8.5-jdk8
 tomcat:8.5-jdk8-corretto
+tomcat:8.5-jdk8-corretto-al2
 tomcat:8.5-jdk8-openjdk
 tomcat:8.5-jdk8-openjdk-bullseye
 tomcat:8.5-jdk8-openjdk-buster
@@ -64,6 +68,7 @@ tomcat:8.5-jdk8-temurin-focal
 tomcat:8.5-jdk8-temurin-jammy
 tomcat:8.5-jdk11
 tomcat:8.5-jdk11-corretto
+tomcat:8.5-jdk11-corretto-al2
 tomcat:8.5-jdk11-openjdk
 tomcat:8.5-jdk11-openjdk-bullseye
 tomcat:8.5-jdk11-openjdk-buster
@@ -75,6 +80,7 @@ tomcat:8.5-jdk11-temurin-focal
 tomcat:8.5-jdk11-temurin-jammy
 tomcat:8.5-jdk17
 tomcat:8.5-jdk17-corretto
+tomcat:8.5-jdk17-corretto-al2
 tomcat:8.5-jdk17-temurin
 tomcat:8.5-jdk17-temurin-focal
 tomcat:8.5-jdk17-temurin-jammy
@@ -105,6 +111,7 @@ tomcat:8.5-jre17-temurin-jammy
 tomcat:8.5.81
 tomcat:8.5.81-jdk8
 tomcat:8.5.81-jdk8-corretto
+tomcat:8.5.81-jdk8-corretto-al2
 tomcat:8.5.81-jdk8-openjdk
 tomcat:8.5.81-jdk8-openjdk-bullseye
 tomcat:8.5.81-jdk8-openjdk-buster
@@ -116,6 +123,7 @@ tomcat:8.5.81-jdk8-temurin-focal
 tomcat:8.5.81-jdk8-temurin-jammy
 tomcat:8.5.81-jdk11
 tomcat:8.5.81-jdk11-corretto
+tomcat:8.5.81-jdk11-corretto-al2
 tomcat:8.5.81-jdk11-openjdk
 tomcat:8.5.81-jdk11-openjdk-bullseye
 tomcat:8.5.81-jdk11-openjdk-buster
@@ -127,6 +135,7 @@ tomcat:8.5.81-jdk11-temurin-focal
 tomcat:8.5.81-jdk11-temurin-jammy
 tomcat:8.5.81-jdk17
 tomcat:8.5.81-jdk17-corretto
+tomcat:8.5.81-jdk17-corretto-al2
 tomcat:8.5.81-jdk17-temurin
 tomcat:8.5.81-jdk17-temurin-focal
 tomcat:8.5.81-jdk17-temurin-jammy
@@ -157,6 +166,7 @@ tomcat:8.5.81-jre17-temurin-jammy
 tomcat:9
 tomcat:9-jdk8
 tomcat:9-jdk8-corretto
+tomcat:9-jdk8-corretto-al2
 tomcat:9-jdk8-openjdk
 tomcat:9-jdk8-openjdk-bullseye
 tomcat:9-jdk8-openjdk-buster
@@ -168,6 +178,7 @@ tomcat:9-jdk8-temurin-focal
 tomcat:9-jdk8-temurin-jammy
 tomcat:9-jdk11
 tomcat:9-jdk11-corretto
+tomcat:9-jdk11-corretto-al2
 tomcat:9-jdk11-openjdk
 tomcat:9-jdk11-openjdk-bullseye
 tomcat:9-jdk11-openjdk-buster
@@ -179,6 +190,7 @@ tomcat:9-jdk11-temurin-focal
 tomcat:9-jdk11-temurin-jammy
 tomcat:9-jdk17
 tomcat:9-jdk17-corretto
+tomcat:9-jdk17-corretto-al2
 tomcat:9-jdk17-temurin
 tomcat:9-jdk17-temurin-focal
 tomcat:9-jdk17-temurin-jammy
@@ -209,6 +221,7 @@ tomcat:9-jre17-temurin-jammy
 tomcat:9.0
 tomcat:9.0-jdk8
 tomcat:9.0-jdk8-corretto
+tomcat:9.0-jdk8-corretto-al2
 tomcat:9.0-jdk8-openjdk
 tomcat:9.0-jdk8-openjdk-bullseye
 tomcat:9.0-jdk8-openjdk-buster
@@ -220,6 +233,7 @@ tomcat:9.0-jdk8-temurin-focal
 tomcat:9.0-jdk8-temurin-jammy
 tomcat:9.0-jdk11
 tomcat:9.0-jdk11-corretto
+tomcat:9.0-jdk11-corretto-al2
 tomcat:9.0-jdk11-openjdk
 tomcat:9.0-jdk11-openjdk-bullseye
 tomcat:9.0-jdk11-openjdk-buster
@@ -231,6 +245,7 @@ tomcat:9.0-jdk11-temurin-focal
 tomcat:9.0-jdk11-temurin-jammy
 tomcat:9.0-jdk17
 tomcat:9.0-jdk17-corretto
+tomcat:9.0-jdk17-corretto-al2
 tomcat:9.0-jdk17-temurin
 tomcat:9.0-jdk17-temurin-focal
 tomcat:9.0-jdk17-temurin-jammy
@@ -258,61 +273,65 @@ tomcat:9.0-jre17
 tomcat:9.0-jre17-temurin
 tomcat:9.0-jre17-temurin-focal
 tomcat:9.0-jre17-temurin-jammy
-tomcat:9.0.64
-tomcat:9.0.64-jdk8
-tomcat:9.0.64-jdk8-corretto
-tomcat:9.0.64-jdk8-openjdk
-tomcat:9.0.64-jdk8-openjdk-bullseye
-tomcat:9.0.64-jdk8-openjdk-buster
-tomcat:9.0.64-jdk8-openjdk-slim
-tomcat:9.0.64-jdk8-openjdk-slim-bullseye
-tomcat:9.0.64-jdk8-openjdk-slim-buster
-tomcat:9.0.64-jdk8-temurin
-tomcat:9.0.64-jdk8-temurin-focal
-tomcat:9.0.64-jdk8-temurin-jammy
-tomcat:9.0.64-jdk11
-tomcat:9.0.64-jdk11-corretto
-tomcat:9.0.64-jdk11-openjdk
-tomcat:9.0.64-jdk11-openjdk-bullseye
-tomcat:9.0.64-jdk11-openjdk-buster
-tomcat:9.0.64-jdk11-openjdk-slim
-tomcat:9.0.64-jdk11-openjdk-slim-bullseye
-tomcat:9.0.64-jdk11-openjdk-slim-buster
-tomcat:9.0.64-jdk11-temurin
-tomcat:9.0.64-jdk11-temurin-focal
-tomcat:9.0.64-jdk11-temurin-jammy
-tomcat:9.0.64-jdk17
-tomcat:9.0.64-jdk17-corretto
-tomcat:9.0.64-jdk17-temurin
-tomcat:9.0.64-jdk17-temurin-focal
-tomcat:9.0.64-jdk17-temurin-jammy
-tomcat:9.0.64-jre8
-tomcat:9.0.64-jre8-openjdk
-tomcat:9.0.64-jre8-openjdk-bullseye
-tomcat:9.0.64-jre8-openjdk-buster
-tomcat:9.0.64-jre8-openjdk-slim
-tomcat:9.0.64-jre8-openjdk-slim-bullseye
-tomcat:9.0.64-jre8-openjdk-slim-buster
-tomcat:9.0.64-jre8-temurin
-tomcat:9.0.64-jre8-temurin-focal
-tomcat:9.0.64-jre8-temurin-jammy
-tomcat:9.0.64-jre11
-tomcat:9.0.64-jre11-openjdk
-tomcat:9.0.64-jre11-openjdk-bullseye
-tomcat:9.0.64-jre11-openjdk-buster
-tomcat:9.0.64-jre11-openjdk-slim
-tomcat:9.0.64-jre11-openjdk-slim-bullseye
-tomcat:9.0.64-jre11-openjdk-slim-buster
-tomcat:9.0.64-jre11-temurin
-tomcat:9.0.64-jre11-temurin-focal
-tomcat:9.0.64-jre11-temurin-jammy
-tomcat:9.0.64-jre17
-tomcat:9.0.64-jre17-temurin
-tomcat:9.0.64-jre17-temurin-focal
-tomcat:9.0.64-jre17-temurin-jammy
+tomcat:9.0.65
+tomcat:9.0.65-jdk8
+tomcat:9.0.65-jdk8-corretto
+tomcat:9.0.65-jdk8-corretto-al2
+tomcat:9.0.65-jdk8-openjdk
+tomcat:9.0.65-jdk8-openjdk-bullseye
+tomcat:9.0.65-jdk8-openjdk-buster
+tomcat:9.0.65-jdk8-openjdk-slim
+tomcat:9.0.65-jdk8-openjdk-slim-bullseye
+tomcat:9.0.65-jdk8-openjdk-slim-buster
+tomcat:9.0.65-jdk8-temurin
+tomcat:9.0.65-jdk8-temurin-focal
+tomcat:9.0.65-jdk8-temurin-jammy
+tomcat:9.0.65-jdk11
+tomcat:9.0.65-jdk11-corretto
+tomcat:9.0.65-jdk11-corretto-al2
+tomcat:9.0.65-jdk11-openjdk
+tomcat:9.0.65-jdk11-openjdk-bullseye
+tomcat:9.0.65-jdk11-openjdk-buster
+tomcat:9.0.65-jdk11-openjdk-slim
+tomcat:9.0.65-jdk11-openjdk-slim-bullseye
+tomcat:9.0.65-jdk11-openjdk-slim-buster
+tomcat:9.0.65-jdk11-temurin
+tomcat:9.0.65-jdk11-temurin-focal
+tomcat:9.0.65-jdk11-temurin-jammy
+tomcat:9.0.65-jdk17
+tomcat:9.0.65-jdk17-corretto
+tomcat:9.0.65-jdk17-corretto-al2
+tomcat:9.0.65-jdk17-temurin
+tomcat:9.0.65-jdk17-temurin-focal
+tomcat:9.0.65-jdk17-temurin-jammy
+tomcat:9.0.65-jre8
+tomcat:9.0.65-jre8-openjdk
+tomcat:9.0.65-jre8-openjdk-bullseye
+tomcat:9.0.65-jre8-openjdk-buster
+tomcat:9.0.65-jre8-openjdk-slim
+tomcat:9.0.65-jre8-openjdk-slim-bullseye
+tomcat:9.0.65-jre8-openjdk-slim-buster
+tomcat:9.0.65-jre8-temurin
+tomcat:9.0.65-jre8-temurin-focal
+tomcat:9.0.65-jre8-temurin-jammy
+tomcat:9.0.65-jre11
+tomcat:9.0.65-jre11-openjdk
+tomcat:9.0.65-jre11-openjdk-bullseye
+tomcat:9.0.65-jre11-openjdk-buster
+tomcat:9.0.65-jre11-openjdk-slim
+tomcat:9.0.65-jre11-openjdk-slim-bullseye
+tomcat:9.0.65-jre11-openjdk-slim-buster
+tomcat:9.0.65-jre11-temurin
+tomcat:9.0.65-jre11-temurin-focal
+tomcat:9.0.65-jre11-temurin-jammy
+tomcat:9.0.65-jre17
+tomcat:9.0.65-jre17-temurin
+tomcat:9.0.65-jre17-temurin-focal
+tomcat:9.0.65-jre17-temurin-jammy
 tomcat:10
 tomcat:10-jdk8
 tomcat:10-jdk8-corretto
+tomcat:10-jdk8-corretto-al2
 tomcat:10-jdk8-openjdk
 tomcat:10-jdk8-openjdk-bullseye
 tomcat:10-jdk8-openjdk-buster
@@ -324,6 +343,7 @@ tomcat:10-jdk8-temurin-focal
 tomcat:10-jdk8-temurin-jammy
 tomcat:10-jdk11
 tomcat:10-jdk11-corretto
+tomcat:10-jdk11-corretto-al2
 tomcat:10-jdk11-openjdk
 tomcat:10-jdk11-openjdk-bullseye
 tomcat:10-jdk11-openjdk-buster
@@ -335,6 +355,7 @@ tomcat:10-jdk11-temurin-focal
 tomcat:10-jdk11-temurin-jammy
 tomcat:10-jdk17
 tomcat:10-jdk17-corretto
+tomcat:10-jdk17-corretto-al2
 tomcat:10-jdk17-temurin
 tomcat:10-jdk17-temurin-focal
 tomcat:10-jdk17-temurin-jammy
@@ -365,6 +386,7 @@ tomcat:10-jre17-temurin-jammy
 tomcat:10.0
 tomcat:10.0-jdk8
 tomcat:10.0-jdk8-corretto
+tomcat:10.0-jdk8-corretto-al2
 tomcat:10.0-jdk8-openjdk
 tomcat:10.0-jdk8-openjdk-bullseye
 tomcat:10.0-jdk8-openjdk-buster
@@ -376,6 +398,7 @@ tomcat:10.0-jdk8-temurin-focal
 tomcat:10.0-jdk8-temurin-jammy
 tomcat:10.0-jdk11
 tomcat:10.0-jdk11-corretto
+tomcat:10.0-jdk11-corretto-al2
 tomcat:10.0-jdk11-openjdk
 tomcat:10.0-jdk11-openjdk-bullseye
 tomcat:10.0-jdk11-openjdk-buster
@@ -387,6 +410,7 @@ tomcat:10.0-jdk11-temurin-focal
 tomcat:10.0-jdk11-temurin-jammy
 tomcat:10.0-jdk17
 tomcat:10.0-jdk17-corretto
+tomcat:10.0-jdk17-corretto-al2
 tomcat:10.0-jdk17-temurin
 tomcat:10.0-jdk17-temurin-focal
 tomcat:10.0-jdk17-temurin-jammy
@@ -417,6 +441,7 @@ tomcat:10.0-jre17-temurin-jammy
 tomcat:10.0.22
 tomcat:10.0.22-jdk8
 tomcat:10.0.22-jdk8-corretto
+tomcat:10.0.22-jdk8-corretto-al2
 tomcat:10.0.22-jdk8-openjdk
 tomcat:10.0.22-jdk8-openjdk-bullseye
 tomcat:10.0.22-jdk8-openjdk-buster
@@ -428,6 +453,7 @@ tomcat:10.0.22-jdk8-temurin-focal
 tomcat:10.0.22-jdk8-temurin-jammy
 tomcat:10.0.22-jdk11
 tomcat:10.0.22-jdk11-corretto
+tomcat:10.0.22-jdk11-corretto-al2
 tomcat:10.0.22-jdk11-openjdk
 tomcat:10.0.22-jdk11-openjdk-bullseye
 tomcat:10.0.22-jdk11-openjdk-buster
@@ -439,6 +465,7 @@ tomcat:10.0.22-jdk11-temurin-focal
 tomcat:10.0.22-jdk11-temurin-jammy
 tomcat:10.0.22-jdk17
 tomcat:10.0.22-jdk17-corretto
+tomcat:10.0.22-jdk17-corretto-al2
 tomcat:10.0.22-jdk17-temurin
 tomcat:10.0.22-jdk17-temurin-focal
 tomcat:10.0.22-jdk17-temurin-jammy
@@ -468,99 +495,46 @@ tomcat:10.0.22-jre17-temurin-focal
 tomcat:10.0.22-jre17-temurin-jammy
 tomcat:10.1
 tomcat:10.1-jdk11
-tomcat:10.1-jdk11-corretto
-tomcat:10.1-jdk11-openjdk
-tomcat:10.1-jdk11-openjdk-bullseye
-tomcat:10.1-jdk11-openjdk-buster
-tomcat:10.1-jdk11-openjdk-slim
-tomcat:10.1-jdk11-openjdk-slim-bullseye
-tomcat:10.1-jdk11-openjdk-slim-buster
 tomcat:10.1-jdk11-temurin
-tomcat:10.1-jdk11-temurin-focal
 tomcat:10.1-jdk11-temurin-jammy
 tomcat:10.1-jdk17
-tomcat:10.1-jdk17-corretto
 tomcat:10.1-jdk17-temurin
-tomcat:10.1-jdk17-temurin-focal
 tomcat:10.1-jdk17-temurin-jammy
 tomcat:10.1-jre11
-tomcat:10.1-jre11-openjdk
-tomcat:10.1-jre11-openjdk-bullseye
-tomcat:10.1-jre11-openjdk-buster
-tomcat:10.1-jre11-openjdk-slim
-tomcat:10.1-jre11-openjdk-slim-bullseye
-tomcat:10.1-jre11-openjdk-slim-buster
 tomcat:10.1-jre11-temurin
-tomcat:10.1-jre11-temurin-focal
 tomcat:10.1-jre11-temurin-jammy
 tomcat:10.1-jre17
 tomcat:10.1-jre17-temurin
-tomcat:10.1-jre17-temurin-focal
 tomcat:10.1-jre17-temurin-jammy
 tomcat:10.1.0
-tomcat:10.1.0-M16
-tomcat:10.1.0-M16-jdk11
-tomcat:10.1.0-M16-jdk11-corretto
-tomcat:10.1.0-M16-jdk11-openjdk
-tomcat:10.1.0-M16-jdk11-openjdk-bullseye
-tomcat:10.1.0-M16-jdk11-openjdk-buster
-tomcat:10.1.0-M16-jdk11-openjdk-slim
-tomcat:10.1.0-M16-jdk11-openjdk-slim-bullseye
-tomcat:10.1.0-M16-jdk11-openjdk-slim-buster
-tomcat:10.1.0-M16-jdk11-temurin
-tomcat:10.1.0-M16-jdk11-temurin-focal
-tomcat:10.1.0-M16-jdk11-temurin-jammy
-tomcat:10.1.0-M16-jdk17
-tomcat:10.1.0-M16-jdk17-corretto
-tomcat:10.1.0-M16-jdk17-temurin
-tomcat:10.1.0-M16-jdk17-temurin-focal
-tomcat:10.1.0-M16-jdk17-temurin-jammy
-tomcat:10.1.0-M16-jre11
-tomcat:10.1.0-M16-jre11-openjdk
-tomcat:10.1.0-M16-jre11-openjdk-bullseye
-tomcat:10.1.0-M16-jre11-openjdk-buster
-tomcat:10.1.0-M16-jre11-openjdk-slim
-tomcat:10.1.0-M16-jre11-openjdk-slim-bullseye
-tomcat:10.1.0-M16-jre11-openjdk-slim-buster
-tomcat:10.1.0-M16-jre11-temurin
-tomcat:10.1.0-M16-jre11-temurin-focal
-tomcat:10.1.0-M16-jre11-temurin-jammy
-tomcat:10.1.0-M16-jre17
-tomcat:10.1.0-M16-jre17-temurin
-tomcat:10.1.0-M16-jre17-temurin-focal
-tomcat:10.1.0-M16-jre17-temurin-jammy
+tomcat:10.1.0-M17
+tomcat:10.1.0-M17-jdk11
+tomcat:10.1.0-M17-jdk11-temurin
+tomcat:10.1.0-M17-jdk11-temurin-jammy
+tomcat:10.1.0-M17-jdk17
+tomcat:10.1.0-M17-jdk17-temurin
+tomcat:10.1.0-M17-jdk17-temurin-jammy
+tomcat:10.1.0-M17-jre11
+tomcat:10.1.0-M17-jre11-temurin
+tomcat:10.1.0-M17-jre11-temurin-jammy
+tomcat:10.1.0-M17-jre17
+tomcat:10.1.0-M17-jre17-temurin
+tomcat:10.1.0-M17-jre17-temurin-jammy
 tomcat:10.1.0-jdk11
-tomcat:10.1.0-jdk11-corretto
-tomcat:10.1.0-jdk11-openjdk
-tomcat:10.1.0-jdk11-openjdk-bullseye
-tomcat:10.1.0-jdk11-openjdk-buster
-tomcat:10.1.0-jdk11-openjdk-slim
-tomcat:10.1.0-jdk11-openjdk-slim-bullseye
-tomcat:10.1.0-jdk11-openjdk-slim-buster
 tomcat:10.1.0-jdk11-temurin
-tomcat:10.1.0-jdk11-temurin-focal
 tomcat:10.1.0-jdk11-temurin-jammy
 tomcat:10.1.0-jdk17
-tomcat:10.1.0-jdk17-corretto
 tomcat:10.1.0-jdk17-temurin
-tomcat:10.1.0-jdk17-temurin-focal
 tomcat:10.1.0-jdk17-temurin-jammy
 tomcat:10.1.0-jre11
-tomcat:10.1.0-jre11-openjdk
-tomcat:10.1.0-jre11-openjdk-bullseye
-tomcat:10.1.0-jre11-openjdk-buster
-tomcat:10.1.0-jre11-openjdk-slim
-tomcat:10.1.0-jre11-openjdk-slim-bullseye
-tomcat:10.1.0-jre11-openjdk-slim-buster
 tomcat:10.1.0-jre11-temurin
-tomcat:10.1.0-jre11-temurin-focal
 tomcat:10.1.0-jre11-temurin-jammy
 tomcat:10.1.0-jre17
 tomcat:10.1.0-jre17-temurin
-tomcat:10.1.0-jre17-temurin-focal
 tomcat:10.1.0-jre17-temurin-jammy
 tomcat:jdk8
 tomcat:jdk8-corretto
+tomcat:jdk8-corretto-al2
 tomcat:jdk8-openjdk
 tomcat:jdk8-openjdk-bullseye
 tomcat:jdk8-openjdk-buster
@@ -572,6 +546,7 @@ tomcat:jdk8-temurin-focal
 tomcat:jdk8-temurin-jammy
 tomcat:jdk11
 tomcat:jdk11-corretto
+tomcat:jdk11-corretto-al2
 tomcat:jdk11-openjdk
 tomcat:jdk11-openjdk-bullseye
 tomcat:jdk11-openjdk-buster
@@ -583,6 +558,7 @@ tomcat:jdk11-temurin-focal
 tomcat:jdk11-temurin-jammy
 tomcat:jdk17
 tomcat:jdk17-corretto
+tomcat:jdk17-corretto-al2
 tomcat:jdk17-temurin
 tomcat:jdk17-temurin-focal
 tomcat:jdk17-temurin-jammy
diff --git a/tomcat_10.1-jdk11-corretto/Dockerfile b/tomcat_10.1-jdk11-corretto/Dockerfile
deleted file mode 100644
index 2500a61..0000000
diff --git a/tomcat_10.1-jdk11-openjdk-buster/Dockerfile b/tomcat_10.1-jdk11-openjdk-buster/Dockerfile
deleted file mode 100644
index a3ddf71..0000000
diff --git a/tomcat_10.1-jdk11-openjdk-slim-buster/Dockerfile b/tomcat_10.1-jdk11-openjdk-slim-buster/Dockerfile
deleted file mode 100644
index 39f5f14..0000000
diff --git a/tomcat_10.1-jdk11-openjdk-slim/Dockerfile b/tomcat_10.1-jdk11-openjdk-slim/Dockerfile
deleted file mode 100644
index 96c64d2..0000000
diff --git a/tomcat_10.1-jdk11-openjdk/Dockerfile b/tomcat_10.1-jdk11-openjdk/Dockerfile
deleted file mode 100644
index 68088c3..0000000
diff --git a/tomcat_10.1-jdk11-temurin-focal/Dockerfile b/tomcat_10.1-jdk11-temurin-focal/Dockerfile
deleted file mode 100644
index 7f6e35c..0000000
diff --git a/tomcat_10.1-jdk11/Dockerfile b/tomcat_10.1-jdk11/Dockerfile
index 6260e80..a16c76a 100644
--- a/tomcat_10.1-jdk11/Dockerfile
+++ b/tomcat_10.1-jdk11/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.0-M16
-ENV TOMCAT_SHA512 ad25f3393324ce42619d6aeeb685186322776b5ba4583453c5e16957fa71cd64fa9f30e379985d57a701be43e9475991312893ee87979e69dd2b51de06510060
+ENV TOMCAT_VERSION 10.1.0-M17
+ENV TOMCAT_SHA512 e56506984201f07c161eaa6757d5e35e834319a071bf8dadef58500d9983194f29c59ba4e42fe8d09c4629525aa11f81ce9b24bfeb31c675f6a0bf505d9b8c7d
 
 RUN set -eux; \
 	\
@@ -98,7 +98,6 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_10.1-jdk17-corretto/Dockerfile b/tomcat_10.1-jdk17-corretto/Dockerfile
deleted file mode 100644
index 9ff24de..0000000
diff --git a/tomcat_10.1-jdk17-temurin-focal/Dockerfile b/tomcat_10.1-jdk17-temurin-focal/Dockerfile
deleted file mode 100644
index 54153c7..0000000
diff --git a/tomcat_10.1-jre11-openjdk-buster/Dockerfile b/tomcat_10.1-jre11-openjdk-buster/Dockerfile
deleted file mode 100644
index 1e62e69..0000000
diff --git a/tomcat_10.1-jre11-openjdk-slim-buster/Dockerfile b/tomcat_10.1-jre11-openjdk-slim-buster/Dockerfile
deleted file mode 100644
index c06a4b3..0000000
diff --git a/tomcat_10.1-jre11-openjdk-slim/Dockerfile b/tomcat_10.1-jre11-openjdk-slim/Dockerfile
deleted file mode 100644
index 3784d00..0000000
diff --git a/tomcat_10.1-jre11-openjdk/Dockerfile b/tomcat_10.1-jre11-openjdk/Dockerfile
deleted file mode 100644
index 7f815c6..0000000
diff --git a/tomcat_10.1-jre11-temurin-focal/Dockerfile b/tomcat_10.1-jre11-temurin-focal/Dockerfile
deleted file mode 100644
index 9e95efc..0000000
diff --git a/tomcat_10.1-jre11/Dockerfile b/tomcat_10.1-jre11/Dockerfile
index 7e27829..bd34199 100644
--- a/tomcat_10.1-jre11/Dockerfile
+++ b/tomcat_10.1-jre11/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.0-M16
-ENV TOMCAT_SHA512 ad25f3393324ce42619d6aeeb685186322776b5ba4583453c5e16957fa71cd64fa9f30e379985d57a701be43e9475991312893ee87979e69dd2b51de06510060
+ENV TOMCAT_VERSION 10.1.0-M17
+ENV TOMCAT_SHA512 e56506984201f07c161eaa6757d5e35e834319a071bf8dadef58500d9983194f29c59ba4e42fe8d09c4629525aa11f81ce9b24bfeb31c675f6a0bf505d9b8c7d
 
-COPY --from=tomcat:10.1.0-M16-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.0-M17-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_10.1-jre17-temurin-focal/Dockerfile b/tomcat_10.1-jre17-temurin-focal/Dockerfile
deleted file mode 100644
index 470a576..0000000
diff --git a/tomcat_10.1-jre17/Dockerfile b/tomcat_10.1-jre17/Dockerfile
index 9e15699..d34fd63 100644
--- a/tomcat_10.1-jre17/Dockerfile
+++ b/tomcat_10.1-jre17/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.0-M16
-ENV TOMCAT_SHA512 ad25f3393324ce42619d6aeeb685186322776b5ba4583453c5e16957fa71cd64fa9f30e379985d57a701be43e9475991312893ee87979e69dd2b51de06510060
+ENV TOMCAT_VERSION 10.1.0-M17
+ENV TOMCAT_SHA512 e56506984201f07c161eaa6757d5e35e834319a071bf8dadef58500d9983194f29c59ba4e42fe8d09c4629525aa11f81ce9b24bfeb31c675f6a0bf505d9b8c7d
 
-COPY --from=tomcat:10.1.0-M16-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.0-M17-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_10.1/Dockerfile b/tomcat_10.1/Dockerfile
index 27cb907..9c82bdd 100644
--- a/tomcat_10.1/Dockerfile
+++ b/tomcat_10.1/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.0-M16
-ENV TOMCAT_SHA512 ad25f3393324ce42619d6aeeb685186322776b5ba4583453c5e16957fa71cd64fa9f30e379985d57a701be43e9475991312893ee87979e69dd2b51de06510060
+ENV TOMCAT_VERSION 10.1.0-M17
+ENV TOMCAT_SHA512 e56506984201f07c161eaa6757d5e35e834319a071bf8dadef58500d9983194f29c59ba4e42fe8d09c4629525aa11f81ce9b24bfeb31c675f6a0bf505d9b8c7d
 
 RUN set -eux; \
 	\
@@ -98,7 +98,6 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk11-corretto/Dockerfile b/tomcat_8-jdk11-corretto/Dockerfile
index 4dac361..291e845 100644
--- a/tomcat_8-jdk11-corretto/Dockerfile
+++ b/tomcat_8-jdk11-corretto/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM amazoncorretto:11
+FROM amazoncorretto:11-al2-jdk
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -107,7 +107,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk11-openjdk-buster/Dockerfile b/tomcat_8-jdk11-openjdk-buster/Dockerfile
index 00f967f..b5da464 100644
--- a/tomcat_8-jdk11-openjdk-buster/Dockerfile
+++ b/tomcat_8-jdk11-openjdk-buster/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk11-openjdk-slim-buster/Dockerfile b/tomcat_8-jdk11-openjdk-slim-buster/Dockerfile
index fc8bd07..1bf6599 100644
--- a/tomcat_8-jdk11-openjdk-slim-buster/Dockerfile
+++ b/tomcat_8-jdk11-openjdk-slim-buster/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk11-openjdk-slim/Dockerfile b/tomcat_8-jdk11-openjdk-slim/Dockerfile
index f507711..3fddbba 100644
--- a/tomcat_8-jdk11-openjdk-slim/Dockerfile
+++ b/tomcat_8-jdk11-openjdk-slim/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk11-openjdk/Dockerfile b/tomcat_8-jdk11-openjdk/Dockerfile
index f7915a9..1409ec1 100644
--- a/tomcat_8-jdk11-openjdk/Dockerfile
+++ b/tomcat_8-jdk11-openjdk/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk11-temurin-focal/Dockerfile b/tomcat_8-jdk11-temurin-focal/Dockerfile
index 626df97..06c1f4a 100644
--- a/tomcat_8-jdk11-temurin-focal/Dockerfile
+++ b/tomcat_8-jdk11-temurin-focal/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk11/Dockerfile b/tomcat_8-jdk11/Dockerfile
index 6fab342..865bf83 100644
--- a/tomcat_8-jdk11/Dockerfile
+++ b/tomcat_8-jdk11/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk17-corretto/Dockerfile b/tomcat_8-jdk17-corretto/Dockerfile
index 7cc53e2..61e641e 100644
--- a/tomcat_8-jdk17-corretto/Dockerfile
+++ b/tomcat_8-jdk17-corretto/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM amazoncorretto:17
+FROM amazoncorretto:17-al2-jdk
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -107,7 +107,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk17-temurin-focal/Dockerfile b/tomcat_8-jdk17-temurin-focal/Dockerfile
index de642d1..593187d 100644
--- a/tomcat_8-jdk17-temurin-focal/Dockerfile
+++ b/tomcat_8-jdk17-temurin-focal/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk8-corretto/Dockerfile b/tomcat_8-jdk8-corretto/Dockerfile
index 5695879..ce56a83 100644
--- a/tomcat_8-jdk8-corretto/Dockerfile
+++ b/tomcat_8-jdk8-corretto/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM amazoncorretto:8
+FROM amazoncorretto:8-al2-jdk
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -107,7 +107,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk8-openjdk-buster/Dockerfile b/tomcat_8-jdk8-openjdk-buster/Dockerfile
index 8587069..172a6e6 100644
--- a/tomcat_8-jdk8-openjdk-buster/Dockerfile
+++ b/tomcat_8-jdk8-openjdk-buster/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk8-openjdk-slim-buster/Dockerfile b/tomcat_8-jdk8-openjdk-slim-buster/Dockerfile
index 7c6c734..3e9ed86 100644
--- a/tomcat_8-jdk8-openjdk-slim-buster/Dockerfile
+++ b/tomcat_8-jdk8-openjdk-slim-buster/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk8-openjdk-slim/Dockerfile b/tomcat_8-jdk8-openjdk-slim/Dockerfile
index 65595f5..fab3cb0 100644
--- a/tomcat_8-jdk8-openjdk-slim/Dockerfile
+++ b/tomcat_8-jdk8-openjdk-slim/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk8-openjdk/Dockerfile b/tomcat_8-jdk8-openjdk/Dockerfile
index f36c5b6..9ea8cc8 100644
--- a/tomcat_8-jdk8-openjdk/Dockerfile
+++ b/tomcat_8-jdk8-openjdk/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk8-temurin-focal/Dockerfile b/tomcat_8-jdk8-temurin-focal/Dockerfile
index 3e4cb9d..d49e87d 100644
--- a/tomcat_8-jdk8-temurin-focal/Dockerfile
+++ b/tomcat_8-jdk8-temurin-focal/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8-jdk8/Dockerfile b/tomcat_8-jdk8/Dockerfile
index 4986bda..60d834b 100644
--- a/tomcat_8-jdk8/Dockerfile
+++ b/tomcat_8-jdk8/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_8/Dockerfile b/tomcat_8/Dockerfile
index a1d534e..b36bf18 100644
--- a/tomcat_8/Dockerfile
+++ b/tomcat_8/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk11-corretto/Dockerfile b/tomcat_9-jdk11-corretto/Dockerfile
index 0e90ff1..07958d8 100644
--- a/tomcat_9-jdk11-corretto/Dockerfile
+++ b/tomcat_9-jdk11-corretto/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM amazoncorretto:11
+FROM amazoncorretto:11-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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -107,7 +107,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk11-openjdk-buster/Dockerfile b/tomcat_9-jdk11-openjdk-buster/Dockerfile
index bd50b18..1f2947b 100644
--- a/tomcat_9-jdk11-openjdk-buster/Dockerfile
+++ b/tomcat_9-jdk11-openjdk-buster/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk11-openjdk-slim-buster/Dockerfile b/tomcat_9-jdk11-openjdk-slim-buster/Dockerfile
index b698102..817e596 100644
--- a/tomcat_9-jdk11-openjdk-slim-buster/Dockerfile
+++ b/tomcat_9-jdk11-openjdk-slim-buster/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk11-openjdk-slim/Dockerfile b/tomcat_9-jdk11-openjdk-slim/Dockerfile
index ff3260a..ceeb2c8 100644
--- a/tomcat_9-jdk11-openjdk-slim/Dockerfile
+++ b/tomcat_9-jdk11-openjdk-slim/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk11-openjdk/Dockerfile b/tomcat_9-jdk11-openjdk/Dockerfile
index aa43b41..df2fb83 100644
--- a/tomcat_9-jdk11-openjdk/Dockerfile
+++ b/tomcat_9-jdk11-openjdk/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk11-temurin-focal/Dockerfile b/tomcat_9-jdk11-temurin-focal/Dockerfile
index 4bf8b2d..5ecf8fe 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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk11/Dockerfile b/tomcat_9-jdk11/Dockerfile
index c60af32..aae0819 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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk17-corretto/Dockerfile b/tomcat_9-jdk17-corretto/Dockerfile
index 21649c3..6320d4e 100644
--- a/tomcat_9-jdk17-corretto/Dockerfile
+++ b/tomcat_9-jdk17-corretto/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM amazoncorretto:17
+FROM amazoncorretto:17-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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -107,7 +107,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk17-temurin-focal/Dockerfile b/tomcat_9-jdk17-temurin-focal/Dockerfile
index 91b28f3..ec2cef3 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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk8-corretto/Dockerfile b/tomcat_9-jdk8-corretto/Dockerfile
index 0464214..2a1b158 100644
--- a/tomcat_9-jdk8-corretto/Dockerfile
+++ b/tomcat_9-jdk8-corretto/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM amazoncorretto:8
+FROM amazoncorretto:8-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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -107,7 +107,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk8-openjdk-buster/Dockerfile b/tomcat_9-jdk8-openjdk-buster/Dockerfile
index 32d601b..4a8ba79 100644
--- a/tomcat_9-jdk8-openjdk-buster/Dockerfile
+++ b/tomcat_9-jdk8-openjdk-buster/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk8-openjdk-slim-buster/Dockerfile b/tomcat_9-jdk8-openjdk-slim-buster/Dockerfile
index 7559f1f..6beb599 100644
--- a/tomcat_9-jdk8-openjdk-slim-buster/Dockerfile
+++ b/tomcat_9-jdk8-openjdk-slim-buster/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk8-openjdk-slim/Dockerfile b/tomcat_9-jdk8-openjdk-slim/Dockerfile
index 9856e60..97afa55 100644
--- a/tomcat_9-jdk8-openjdk-slim/Dockerfile
+++ b/tomcat_9-jdk8-openjdk-slim/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk8-openjdk/Dockerfile b/tomcat_9-jdk8-openjdk/Dockerfile
index 2315bf3..d92e5c7 100644
--- a/tomcat_9-jdk8-openjdk/Dockerfile
+++ b/tomcat_9-jdk8-openjdk/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk8-temurin-focal/Dockerfile b/tomcat_9-jdk8-temurin-focal/Dockerfile
index 976ebb1..f1a22fe 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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jdk8/Dockerfile b/tomcat_9-jdk8/Dockerfile
index d861f74..ea124fe 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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_9-jre11-openjdk-buster/Dockerfile b/tomcat_9-jre11-openjdk-buster/Dockerfile
index 09a663a..5c8c23a 100644
--- a/tomcat_9-jre11-openjdk-buster/Dockerfile
+++ b/tomcat_9-jre11-openjdk-buster/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk11-openjdk-buster $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-jdk11-openjdk-buster $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-openjdk-slim-buster/Dockerfile b/tomcat_9-jre11-openjdk-slim-buster/Dockerfile
index c5a1b0e..2fdacd3 100644
--- a/tomcat_9-jre11-openjdk-slim-buster/Dockerfile
+++ b/tomcat_9-jre11-openjdk-slim-buster/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk11-openjdk-slim-buster $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-jdk11-openjdk-slim-buster $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-openjdk-slim/Dockerfile b/tomcat_9-jre11-openjdk-slim/Dockerfile
index 5f63c86..deb5412 100644
--- a/tomcat_9-jre11-openjdk-slim/Dockerfile
+++ b/tomcat_9-jre11-openjdk-slim/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk11-openjdk-slim-bullseye $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-jdk11-openjdk-slim-bullseye $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-openjdk/Dockerfile b/tomcat_9-jre11-openjdk/Dockerfile
index 843d0f4..3aeecb2 100644
--- a/tomcat_9-jre11-openjdk/Dockerfile
+++ b/tomcat_9-jre11-openjdk/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk11-openjdk-bullseye $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-jdk11-openjdk-bullseye $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-jre11-temurin-focal/Dockerfile
index 11d8192..42c0943 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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk11-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-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 86d0ddd..89e9fae 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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-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 b0988ba..6fe440d 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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk17-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-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 5800499..a1ab71d 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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-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-jre8-openjdk-buster/Dockerfile b/tomcat_9-jre8-openjdk-buster/Dockerfile
index c53239b..b6f922d 100644
--- a/tomcat_9-jre8-openjdk-buster/Dockerfile
+++ b/tomcat_9-jre8-openjdk-buster/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk8-openjdk-buster $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-jdk8-openjdk-buster $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-openjdk-slim-buster/Dockerfile b/tomcat_9-jre8-openjdk-slim-buster/Dockerfile
index 3c78291..d332ac4 100644
--- a/tomcat_9-jre8-openjdk-slim-buster/Dockerfile
+++ b/tomcat_9-jre8-openjdk-slim-buster/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk8-openjdk-slim-buster $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-jdk8-openjdk-slim-buster $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-openjdk-slim/Dockerfile b/tomcat_9-jre8-openjdk-slim/Dockerfile
index 8297612..39e3ae2 100644
--- a/tomcat_9-jre8-openjdk-slim/Dockerfile
+++ b/tomcat_9-jre8-openjdk-slim/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk8-openjdk-slim-bullseye $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-jdk8-openjdk-slim-bullseye $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-openjdk/Dockerfile b/tomcat_9-jre8-openjdk/Dockerfile
index 22fdf11..ee12676 100644
--- a/tomcat_9-jre8-openjdk/Dockerfile
+++ b/tomcat_9-jre8-openjdk/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk8-openjdk-bullseye $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-jdk8-openjdk-bullseye $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 c8c5c39..3ce74a1 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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk8-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-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 0bd580e..74fe6d8 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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
-COPY --from=tomcat:9.0.64-jdk8-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.65-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 0a0f638..f41f095 100644
--- a/tomcat_9/Dockerfile
+++ b/tomcat_9/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.64
-ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
+ENV TOMCAT_VERSION 9.0.65
+ENV TOMCAT_SHA512 2ae846848b8436856be11cfa18d9c62caa06ca7d3134012b2e10cbf6078753c4af20cc5d37f7dc75f1779f5c59d7c033850b8626534c3ce7e389641a67963cf6
 
 RUN set -eux; \
 	\
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk11-corretto/Dockerfile b/tomcat_jdk11-corretto/Dockerfile
index 5331284..0eca318 100644
--- a/tomcat_jdk11-corretto/Dockerfile
+++ b/tomcat_jdk11-corretto/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM amazoncorretto:11
+FROM amazoncorretto:11-al2-jdk
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -107,7 +107,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk11-openjdk-buster/Dockerfile b/tomcat_jdk11-openjdk-buster/Dockerfile
index 59cb70e..a3b8180 100644
--- a/tomcat_jdk11-openjdk-buster/Dockerfile
+++ b/tomcat_jdk11-openjdk-buster/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk11-openjdk-slim-buster/Dockerfile b/tomcat_jdk11-openjdk-slim-buster/Dockerfile
index 39ba5ab..9ac8032 100644
--- a/tomcat_jdk11-openjdk-slim-buster/Dockerfile
+++ b/tomcat_jdk11-openjdk-slim-buster/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk11-openjdk-slim/Dockerfile b/tomcat_jdk11-openjdk-slim/Dockerfile
index 54eab19..da4c828 100644
--- a/tomcat_jdk11-openjdk-slim/Dockerfile
+++ b/tomcat_jdk11-openjdk-slim/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk11-openjdk/Dockerfile b/tomcat_jdk11-openjdk/Dockerfile
index ee8c2d7..d501300 100644
--- a/tomcat_jdk11-openjdk/Dockerfile
+++ b/tomcat_jdk11-openjdk/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk11-temurin-focal/Dockerfile b/tomcat_jdk11-temurin-focal/Dockerfile
index de93a24..b425174 100644
--- a/tomcat_jdk11-temurin-focal/Dockerfile
+++ b/tomcat_jdk11-temurin-focal/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk11/Dockerfile b/tomcat_jdk11/Dockerfile
index 04463da..16fa1ff 100644
--- a/tomcat_jdk11/Dockerfile
+++ b/tomcat_jdk11/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk17-corretto/Dockerfile b/tomcat_jdk17-corretto/Dockerfile
index 676ce21..b766f16 100644
--- a/tomcat_jdk17-corretto/Dockerfile
+++ b/tomcat_jdk17-corretto/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM amazoncorretto:17
+FROM amazoncorretto:17-al2-jdk
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -107,7 +107,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk17-temurin-focal/Dockerfile b/tomcat_jdk17-temurin-focal/Dockerfile
index bdc8a26..2cb1d90 100644
--- a/tomcat_jdk17-temurin-focal/Dockerfile
+++ b/tomcat_jdk17-temurin-focal/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk8-corretto/Dockerfile b/tomcat_jdk8-corretto/Dockerfile
index 388b0d0..1eebed8 100644
--- a/tomcat_jdk8-corretto/Dockerfile
+++ b/tomcat_jdk8-corretto/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM amazoncorretto:8
+FROM amazoncorretto:8-al2-jdk
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -107,7 +107,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk8-openjdk-buster/Dockerfile b/tomcat_jdk8-openjdk-buster/Dockerfile
index 4fff09d..61803e5 100644
--- a/tomcat_jdk8-openjdk-buster/Dockerfile
+++ b/tomcat_jdk8-openjdk-buster/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk8-openjdk-slim-buster/Dockerfile b/tomcat_jdk8-openjdk-slim-buster/Dockerfile
index c788ab1..6f28f0f 100644
--- a/tomcat_jdk8-openjdk-slim-buster/Dockerfile
+++ b/tomcat_jdk8-openjdk-slim-buster/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk8-openjdk-slim/Dockerfile b/tomcat_jdk8-openjdk-slim/Dockerfile
index c43649f..27ce783 100644
--- a/tomcat_jdk8-openjdk-slim/Dockerfile
+++ b/tomcat_jdk8-openjdk-slim/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk8-openjdk/Dockerfile b/tomcat_jdk8-openjdk/Dockerfile
index aac62eb..088a254 100644
--- a/tomcat_jdk8-openjdk/Dockerfile
+++ b/tomcat_jdk8-openjdk/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk8-temurin-focal/Dockerfile b/tomcat_jdk8-temurin-focal/Dockerfile
index b5de92a..d05c0fd 100644
--- a/tomcat_jdk8-temurin-focal/Dockerfile
+++ b/tomcat_jdk8-temurin-focal/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_jdk8/Dockerfile b/tomcat_jdk8/Dockerfile
index 0f8913a..033c888 100644
--- a/tomcat_jdk8/Dockerfile
+++ b/tomcat_jdk8/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \
diff --git a/tomcat_latest/Dockerfile b/tomcat_latest/Dockerfile
index 1e8d3db..1347b47 100644
--- a/tomcat_latest/Dockerfile
+++ b/tomcat_latest/Dockerfile
@@ -98,7 +98,7 @@ RUN set -eux; \
 			--prefix="$CATALINA_HOME" \
 			--with-apr="$aprConfig" \
 			--with-java-home="$JAVA_HOME" \
-			--with-ssl=yes \
+			--with-ssl \
 		; \
 		nproc="$(nproc)"; \
 		make -j "$nproc"; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 4f35193 into docker-library:master Jul 21, 2022
@yosifkit yosifkit deleted the tomcat branch July 21, 2022 22:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants