Update tomcat

[tianon]

Changes:

• docker-library/tomcat@656cbf4: Merge pull request Add noble variants, remove focal variants tomcat#319 from LaurentGoderre/noble
• docker-library/tomcat@11b7d07: Add noble variants, remove focal variants

[github-actions]

Diff for daff4cb:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 18fa286..6bffdc5 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,127 +6,177 @@ Architectures: amd64, arm64v8
 GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
 Directory: 9.0/jdk8/corretto-al2
 
-Tags: 9.0.91-jdk8-temurin-focal, 9.0-jdk8-temurin-focal, 9-jdk8-temurin-focal
+Tags: 9.0.91-jdk8-temurin-jammy, 9.0-jdk8-temurin-jammy, 9-jdk8-temurin-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le
 GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
-Directory: 9.0/jdk8/temurin-focal
+Directory: 9.0/jdk8/temurin-jammy
 
-Tags: 9.0.91-jdk8-temurin-jammy, 9.0-jdk8-temurin-jammy, 9-jdk8-temurin-jammy, 9.0.91-jdk8-temurin, 9.0-jdk8-temurin, 9-jdk8-temurin, 9.0.91-jdk8, 9.0-jdk8, 9-jdk8
+Tags: 9.0.91-jdk8-temurin-noble, 9.0-jdk8-temurin-noble, 9-jdk8-temurin-noble, 9.0.91-jdk8-temurin, 9.0-jdk8-temurin, 9-jdk8-temurin, 9.0.91-jdk8, 9.0-jdk8, 9-jdk8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
-Directory: 9.0/jdk8/temurin-jammy
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 9.0/jdk8/temurin-noble
 
 Tags: 9.0.91-jdk11-corretto-al2, 9.0-jdk11-corretto-al2, 9-jdk11-corretto-al2, 9.0.91-jdk11-corretto, 9.0-jdk11-corretto, 9-jdk11-corretto
 Architectures: amd64, arm64v8
 GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
 Directory: 9.0/jdk11/corretto-al2
 
-Tags: 9.0.91-jdk11-temurin-focal, 9.0-jdk11-temurin-focal, 9-jdk11-temurin-focal
+Tags: 9.0.91-jdk11-temurin-jammy, 9.0-jdk11-temurin-jammy, 9-jdk11-temurin-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
-Directory: 9.0/jdk11/temurin-focal
+Directory: 9.0/jdk11/temurin-jammy
 
-Tags: 9.0.91-jdk11-temurin-jammy, 9.0-jdk11-temurin-jammy, 9-jdk11-temurin-jammy, 9.0.91-jdk11-temurin, 9.0-jdk11-temurin, 9-jdk11-temurin, 9.0.91-jdk11, 9.0-jdk11, 9-jdk11
+Tags: 9.0.91-jdk11-temurin-noble, 9.0-jdk11-temurin-noble, 9-jdk11-temurin-noble, 9.0.91-jdk11-temurin, 9.0-jdk11-temurin, 9-jdk11-temurin, 9.0.91-jdk11, 9.0-jdk11, 9-jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
-Directory: 9.0/jdk11/temurin-jammy
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 9.0/jdk11/temurin-noble
 
 Tags: 9.0.91-jdk17-corretto-al2, 9.0-jdk17-corretto-al2, 9-jdk17-corretto-al2, 9.0.91-jdk17-corretto, 9.0-jdk17-corretto, 9-jdk17-corretto
 Architectures: amd64, arm64v8
 GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
 Directory: 9.0/jdk17/corretto-al2
 
-Tags: 9.0.91-jdk17-temurin-focal, 9.0-jdk17-temurin-focal, 9-jdk17-temurin-focal
+Tags: 9.0.91-jdk17-temurin-jammy, 9.0-jdk17-temurin-jammy, 9-jdk17-temurin-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
-Directory: 9.0/jdk17/temurin-focal
+Directory: 9.0/jdk17/temurin-jammy
 
-Tags: 9.0.91-jdk17-temurin-jammy, 9.0-jdk17-temurin-jammy, 9-jdk17-temurin-jammy, 9.0.91-jdk17-temurin, 9.0-jdk17-temurin, 9-jdk17-temurin, 9.0.91-jdk17, 9.0-jdk17, 9-jdk17
+Tags: 9.0.91-jdk17-temurin-noble, 9.0-jdk17-temurin-noble, 9-jdk17-temurin-noble, 9.0.91-jdk17-temurin, 9.0-jdk17-temurin, 9-jdk17-temurin, 9.0.91-jdk17, 9.0-jdk17, 9-jdk17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
-Directory: 9.0/jdk17/temurin-jammy
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 9.0/jdk17/temurin-noble
 
 Tags: 9.0.91-jdk21-corretto-al2, 9.0-jdk21-corretto-al2, 9-jdk21-corretto-al2, 9.0.91-jdk21-corretto, 9.0-jdk21-corretto, 9-jdk21-corretto
 Architectures: amd64, arm64v8
 GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
 Directory: 9.0/jdk21/corretto-al2
 
-Tags: 9.0.91-jdk21-temurin-jammy, 9.0-jdk21-temurin-jammy, 9-jdk21-temurin-jammy, 9.0.91-jdk21-temurin, 9.0-jdk21-temurin, 9-jdk21-temurin, 9.0.91-jdk21, 9.0-jdk21, 9-jdk21, 9.0.91, 9.0, 9
+Tags: 9.0.91-jdk21-temurin-jammy, 9.0-jdk21-temurin-jammy, 9-jdk21-temurin-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
 GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
 Directory: 9.0/jdk21/temurin-jammy
 
-Tags: 9.0.91-jre8-temurin-focal, 9.0-jre8-temurin-focal, 9-jre8-temurin-focal
-Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
-Directory: 9.0/jre8/temurin-focal
+Tags: 9.0.91-jdk21-temurin-noble, 9.0-jdk21-temurin-noble, 9-jdk21-temurin-noble, 9.0.91-jdk21-temurin, 9.0-jdk21-temurin, 9-jdk21-temurin, 9.0.91-jdk21, 9.0-jdk21, 9-jdk21, 9.0.91, 9.0, 9
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 9.0/jdk21/temurin-noble
 
-Tags: 9.0.91-jre8-temurin-jammy, 9.0-jre8-temurin-jammy, 9-jre8-temurin-jammy, 9.0.91-jre8-temurin, 9.0-jre8-temurin, 9-jre8-temurin, 9.0.91-jre8, 9.0-jre8, 9-jre8
+Tags: 9.0.91-jre8-temurin-jammy, 9.0-jre8-temurin-jammy, 9-jre8-temurin-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le
 GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
 Directory: 9.0/jre8/temurin-jammy
 
-Tags: 9.0.91-jre11-temurin-focal, 9.0-jre11-temurin-focal, 9-jre11-temurin-focal
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
-Directory: 9.0/jre11/temurin-focal
+Tags: 9.0.91-jre8-temurin-noble, 9.0-jre8-temurin-noble, 9-jre8-temurin-noble, 9.0.91-jre8-temurin, 9.0-jre8-temurin, 9-jre8-temurin, 9.0.91-jre8, 9.0-jre8, 9-jre8
+Architectures: amd64, arm32v7, arm64v8, ppc64le
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 9.0/jre8/temurin-noble
 
-Tags: 9.0.91-jre11-temurin-jammy, 9.0-jre11-temurin-jammy, 9-jre11-temurin-jammy, 9.0.91-jre11-temurin, 9.0-jre11-temurin, 9-jre11-temurin, 9.0.91-jre11, 9.0-jre11, 9-jre11
+Tags: 9.0.91-jre11-temurin-jammy, 9.0-jre11-temurin-jammy, 9-jre11-temurin-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
 Directory: 9.0/jre11/temurin-jammy
 
-Tags: 9.0.91-jre17-temurin-focal, 9.0-jre17-temurin-focal, 9-jre17-temurin-focal
+Tags: 9.0.91-jre11-temurin-noble, 9.0-jre11-temurin-noble, 9-jre11-temurin-noble, 9.0.91-jre11-temurin, 9.0-jre11-temurin, 9-jre11-temurin, 9.0.91-jre11, 9.0-jre11, 9-jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
-Directory: 9.0/jre17/temurin-focal
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 9.0/jre11/temurin-noble
 
-Tags: 9.0.91-jre17-temurin-jammy, 9.0-jre17-temurin-jammy, 9-jre17-temurin-jammy, 9.0.91-jre17-temurin, 9.0-jre17-temurin, 9-jre17-temurin, 9.0.91-jre17, 9.0-jre17, 9-jre17
+Tags: 9.0.91-jre17-temurin-jammy, 9.0-jre17-temurin-jammy, 9-jre17-temurin-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
 Directory: 9.0/jre17/temurin-jammy
 
-Tags: 9.0.91-jre21-temurin-jammy, 9.0-jre21-temurin-jammy, 9-jre21-temurin-jammy, 9.0.91-jre21-temurin, 9.0-jre21-temurin, 9-jre21-temurin, 9.0.91-jre21, 9.0-jre21, 9-jre21
+Tags: 9.0.91-jre17-temurin-noble, 9.0-jre17-temurin-noble, 9-jre17-temurin-noble, 9.0.91-jre17-temurin, 9.0-jre17-temurin, 9-jre17-temurin, 9.0.91-jre17, 9.0-jre17, 9-jre17
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 9.0/jre17/temurin-noble
+
+Tags: 9.0.91-jre21-temurin-jammy, 9.0-jre21-temurin-jammy, 9-jre21-temurin-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
 GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
 Directory: 9.0/jre21/temurin-jammy
 
-Tags: 10.1.26-jdk11-temurin-jammy, 10.1-jdk11-temurin-jammy, 10-jdk11-temurin-jammy, jdk11-temurin-jammy, 10.1.26-jdk11-temurin, 10.1-jdk11-temurin, 10-jdk11-temurin, jdk11-temurin, 10.1.26-jdk11, 10.1-jdk11, 10-jdk11, jdk11
+Tags: 9.0.91-jre21-temurin-noble, 9.0-jre21-temurin-noble, 9-jre21-temurin-noble, 9.0.91-jre21-temurin, 9.0-jre21-temurin, 9-jre21-temurin, 9.0.91-jre21, 9.0-jre21, 9-jre21
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 9.0/jre21/temurin-noble
+
+Tags: 10.1.26-jdk11-temurin-jammy, 10.1-jdk11-temurin-jammy, 10-jdk11-temurin-jammy, jdk11-temurin-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: a4b26353acf854ee3f0a656eec8297c9ffc632a0
 Directory: 10.1/jdk11/temurin-jammy
 
-Tags: 10.1.26-jdk17-temurin-jammy, 10.1-jdk17-temurin-jammy, 10-jdk17-temurin-jammy, jdk17-temurin-jammy, 10.1.26-jdk17-temurin, 10.1-jdk17-temurin, 10-jdk17-temurin, jdk17-temurin, 10.1.26-jdk17, 10.1-jdk17, 10-jdk17, jdk17
+Tags: 10.1.26-jdk11-temurin-noble, 10.1-jdk11-temurin-noble, 10-jdk11-temurin-noble, jdk11-temurin-noble, 10.1.26-jdk11-temurin, 10.1-jdk11-temurin, 10-jdk11-temurin, jdk11-temurin, 10.1.26-jdk11, 10.1-jdk11, 10-jdk11, jdk11
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 10.1/jdk11/temurin-noble
+
+Tags: 10.1.26-jdk17-temurin-jammy, 10.1-jdk17-temurin-jammy, 10-jdk17-temurin-jammy, jdk17-temurin-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: a4b26353acf854ee3f0a656eec8297c9ffc632a0
 Directory: 10.1/jdk17/temurin-jammy
 
-Tags: 10.1.26-jdk21-temurin-jammy, 10.1-jdk21-temurin-jammy, 10-jdk21-temurin-jammy, jdk21-temurin-jammy, 10.1.26-jdk21-temurin, 10.1-jdk21-temurin, 10-jdk21-temurin, jdk21-temurin, 10.1.26-jdk21, 10.1-jdk21, 10-jdk21, jdk21, 10.1.26, 10.1, 10, latest
+Tags: 10.1.26-jdk17-temurin-noble, 10.1-jdk17-temurin-noble, 10-jdk17-temurin-noble, jdk17-temurin-noble, 10.1.26-jdk17-temurin, 10.1-jdk17-temurin, 10-jdk17-temurin, jdk17-temurin, 10.1.26-jdk17, 10.1-jdk17, 10-jdk17, jdk17
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 10.1/jdk17/temurin-noble
+
+Tags: 10.1.26-jdk21-temurin-jammy, 10.1-jdk21-temurin-jammy, 10-jdk21-temurin-jammy, jdk21-temurin-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
 GitCommit: a4b26353acf854ee3f0a656eec8297c9ffc632a0
 Directory: 10.1/jdk21/temurin-jammy
 
-Tags: 10.1.26-jre11-temurin-jammy, 10.1-jre11-temurin-jammy, 10-jre11-temurin-jammy, jre11-temurin-jammy, 10.1.26-jre11-temurin, 10.1-jre11-temurin, 10-jre11-temurin, jre11-temurin, 10.1.26-jre11, 10.1-jre11, 10-jre11, jre11
+Tags: 10.1.26-jdk21-temurin-noble, 10.1-jdk21-temurin-noble, 10-jdk21-temurin-noble, jdk21-temurin-noble, 10.1.26-jdk21-temurin, 10.1-jdk21-temurin, 10-jdk21-temurin, jdk21-temurin, 10.1.26-jdk21, 10.1-jdk21, 10-jdk21, jdk21, 10.1.26, 10.1, 10, latest
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 10.1/jdk21/temurin-noble
+
+Tags: 10.1.26-jre11-temurin-jammy, 10.1-jre11-temurin-jammy, 10-jre11-temurin-jammy, jre11-temurin-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: a4b26353acf854ee3f0a656eec8297c9ffc632a0
 Directory: 10.1/jre11/temurin-jammy
 
-Tags: 10.1.26-jre17-temurin-jammy, 10.1-jre17-temurin-jammy, 10-jre17-temurin-jammy, jre17-temurin-jammy, 10.1.26-jre17-temurin, 10.1-jre17-temurin, 10-jre17-temurin, jre17-temurin, 10.1.26-jre17, 10.1-jre17, 10-jre17, jre17
+Tags: 10.1.26-jre11-temurin-noble, 10.1-jre11-temurin-noble, 10-jre11-temurin-noble, jre11-temurin-noble, 10.1.26-jre11-temurin, 10.1-jre11-temurin, 10-jre11-temurin, jre11-temurin, 10.1.26-jre11, 10.1-jre11, 10-jre11, jre11
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 10.1/jre11/temurin-noble
+
+Tags: 10.1.26-jre17-temurin-jammy, 10.1-jre17-temurin-jammy, 10-jre17-temurin-jammy, jre17-temurin-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: a4b26353acf854ee3f0a656eec8297c9ffc632a0
 Directory: 10.1/jre17/temurin-jammy
 
-Tags: 10.1.26-jre21-temurin-jammy, 10.1-jre21-temurin-jammy, 10-jre21-temurin-jammy, jre21-temurin-jammy, 10.1.26-jre21-temurin, 10.1-jre21-temurin, 10-jre21-temurin, jre21-temurin, 10.1.26-jre21, 10.1-jre21, 10-jre21, jre21
+Tags: 10.1.26-jre17-temurin-noble, 10.1-jre17-temurin-noble, 10-jre17-temurin-noble, jre17-temurin-noble, 10.1.26-jre17-temurin, 10.1-jre17-temurin, 10-jre17-temurin, jre17-temurin, 10.1.26-jre17, 10.1-jre17, 10-jre17, jre17
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 10.1/jre17/temurin-noble
+
+Tags: 10.1.26-jre21-temurin-jammy, 10.1-jre21-temurin-jammy, 10-jre21-temurin-jammy, jre21-temurin-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
 GitCommit: a4b26353acf854ee3f0a656eec8297c9ffc632a0
 Directory: 10.1/jre21/temurin-jammy
 
-Tags: 11.0.0-M22-jdk21-temurin-jammy, 11.0.0-jdk21-temurin-jammy, 11.0-jdk21-temurin-jammy, 11.0.0-M22-jdk21-temurin, 11.0.0-jdk21-temurin, 11.0-jdk21-temurin, 11.0.0-M22-jdk21, 11.0.0-jdk21, 11.0-jdk21, 11.0.0-M22, 11.0.0, 11.0
+Tags: 10.1.26-jre21-temurin-noble, 10.1-jre21-temurin-noble, 10-jre21-temurin-noble, jre21-temurin-noble, 10.1.26-jre21-temurin, 10.1-jre21-temurin, 10-jre21-temurin, jre21-temurin, 10.1.26-jre21, 10.1-jre21, 10-jre21, jre21
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 10.1/jre21/temurin-noble
+
+Tags: 11.0.0-M22-jdk21-temurin-jammy, 11.0.0-jdk21-temurin-jammy, 11.0-jdk21-temurin-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
 GitCommit: f310ad695a638b361001f95f7a35f0cc43db6e35
 Directory: 11.0/jdk21/temurin-jammy
 
-Tags: 11.0.0-M22-jre21-temurin-jammy, 11.0.0-jre21-temurin-jammy, 11.0-jre21-temurin-jammy, 11.0.0-M22-jre21-temurin, 11.0.0-jre21-temurin, 11.0-jre21-temurin, 11.0.0-M22-jre21, 11.0.0-jre21, 11.0-jre21
+Tags: 11.0.0-M22-jdk21-temurin-noble, 11.0.0-jdk21-temurin-noble, 11.0-jdk21-temurin-noble, 11.0.0-M22-jdk21-temurin, 11.0.0-jdk21-temurin, 11.0-jdk21-temurin, 11.0.0-M22-jdk21, 11.0.0-jdk21, 11.0-jdk21, 11.0.0-M22, 11.0.0, 11.0
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 11.0/jdk21/temurin-noble
+
+Tags: 11.0.0-M22-jre21-temurin-jammy, 11.0.0-jre21-temurin-jammy, 11.0-jre21-temurin-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
 GitCommit: f310ad695a638b361001f95f7a35f0cc43db6e35
 Directory: 11.0/jre21/temurin-jammy
+
+Tags: 11.0.0-M22-jre21-temurin-noble, 11.0.0-jre21-temurin-noble, 11.0-jre21-temurin-noble, 11.0.0-M22-jre21-temurin, 11.0.0-jre21-temurin, 11.0-jre21-temurin, 11.0.0-M22-jre21, 11.0.0-jre21, 11.0-jre21
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 11b7d077d48f21a6efa58d00258301676664774e
+Directory: 11.0/jre21/temurin-noble
diff --git a/_bashbrew-list b/_bashbrew-list
index 6c21aaa..948f950 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,212 +3,248 @@ tomcat:9-jdk8
 tomcat:9-jdk8-corretto
 tomcat:9-jdk8-corretto-al2
 tomcat:9-jdk8-temurin
-tomcat:9-jdk8-temurin-focal
 tomcat:9-jdk8-temurin-jammy
+tomcat:9-jdk8-temurin-noble
 tomcat:9-jdk11
 tomcat:9-jdk11-corretto
 tomcat:9-jdk11-corretto-al2
 tomcat:9-jdk11-temurin
-tomcat:9-jdk11-temurin-focal
 tomcat:9-jdk11-temurin-jammy
+tomcat:9-jdk11-temurin-noble
 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
+tomcat:9-jdk17-temurin-noble
 tomcat:9-jdk21
 tomcat:9-jdk21-corretto
 tomcat:9-jdk21-corretto-al2
 tomcat:9-jdk21-temurin
 tomcat:9-jdk21-temurin-jammy
+tomcat:9-jdk21-temurin-noble
 tomcat:9-jre8
 tomcat:9-jre8-temurin
-tomcat:9-jre8-temurin-focal
 tomcat:9-jre8-temurin-jammy
+tomcat:9-jre8-temurin-noble
 tomcat:9-jre11
 tomcat:9-jre11-temurin
-tomcat:9-jre11-temurin-focal
 tomcat:9-jre11-temurin-jammy
+tomcat:9-jre11-temurin-noble
 tomcat:9-jre17
 tomcat:9-jre17-temurin
-tomcat:9-jre17-temurin-focal
 tomcat:9-jre17-temurin-jammy
+tomcat:9-jre17-temurin-noble
 tomcat:9-jre21
 tomcat:9-jre21-temurin
 tomcat:9-jre21-temurin-jammy
+tomcat:9-jre21-temurin-noble
 tomcat:9.0
 tomcat:9.0-jdk8
 tomcat:9.0-jdk8-corretto
 tomcat:9.0-jdk8-corretto-al2
 tomcat:9.0-jdk8-temurin
-tomcat:9.0-jdk8-temurin-focal
 tomcat:9.0-jdk8-temurin-jammy
+tomcat:9.0-jdk8-temurin-noble
 tomcat:9.0-jdk11
 tomcat:9.0-jdk11-corretto
 tomcat:9.0-jdk11-corretto-al2
 tomcat:9.0-jdk11-temurin
-tomcat:9.0-jdk11-temurin-focal
 tomcat:9.0-jdk11-temurin-jammy
+tomcat:9.0-jdk11-temurin-noble
 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
+tomcat:9.0-jdk17-temurin-noble
 tomcat:9.0-jdk21
 tomcat:9.0-jdk21-corretto
 tomcat:9.0-jdk21-corretto-al2
 tomcat:9.0-jdk21-temurin
 tomcat:9.0-jdk21-temurin-jammy
+tomcat:9.0-jdk21-temurin-noble
 tomcat:9.0-jre8
 tomcat:9.0-jre8-temurin
-tomcat:9.0-jre8-temurin-focal
 tomcat:9.0-jre8-temurin-jammy
+tomcat:9.0-jre8-temurin-noble
 tomcat:9.0-jre11
 tomcat:9.0-jre11-temurin
-tomcat:9.0-jre11-temurin-focal
 tomcat:9.0-jre11-temurin-jammy
+tomcat:9.0-jre11-temurin-noble
 tomcat:9.0-jre17
 tomcat:9.0-jre17-temurin
-tomcat:9.0-jre17-temurin-focal
 tomcat:9.0-jre17-temurin-jammy
+tomcat:9.0-jre17-temurin-noble
 tomcat:9.0-jre21
 tomcat:9.0-jre21-temurin
 tomcat:9.0-jre21-temurin-jammy
+tomcat:9.0-jre21-temurin-noble
 tomcat:9.0.91
 tomcat:9.0.91-jdk8
 tomcat:9.0.91-jdk8-corretto
 tomcat:9.0.91-jdk8-corretto-al2
 tomcat:9.0.91-jdk8-temurin
-tomcat:9.0.91-jdk8-temurin-focal
 tomcat:9.0.91-jdk8-temurin-jammy
+tomcat:9.0.91-jdk8-temurin-noble
 tomcat:9.0.91-jdk11
 tomcat:9.0.91-jdk11-corretto
 tomcat:9.0.91-jdk11-corretto-al2
 tomcat:9.0.91-jdk11-temurin
-tomcat:9.0.91-jdk11-temurin-focal
 tomcat:9.0.91-jdk11-temurin-jammy
+tomcat:9.0.91-jdk11-temurin-noble
 tomcat:9.0.91-jdk17
 tomcat:9.0.91-jdk17-corretto
 tomcat:9.0.91-jdk17-corretto-al2
 tomcat:9.0.91-jdk17-temurin
-tomcat:9.0.91-jdk17-temurin-focal
 tomcat:9.0.91-jdk17-temurin-jammy
+tomcat:9.0.91-jdk17-temurin-noble
 tomcat:9.0.91-jdk21
 tomcat:9.0.91-jdk21-corretto
 tomcat:9.0.91-jdk21-corretto-al2
 tomcat:9.0.91-jdk21-temurin
 tomcat:9.0.91-jdk21-temurin-jammy
+tomcat:9.0.91-jdk21-temurin-noble
 tomcat:9.0.91-jre8
 tomcat:9.0.91-jre8-temurin
-tomcat:9.0.91-jre8-temurin-focal
 tomcat:9.0.91-jre8-temurin-jammy
+tomcat:9.0.91-jre8-temurin-noble
 tomcat:9.0.91-jre11
 tomcat:9.0.91-jre11-temurin
-tomcat:9.0.91-jre11-temurin-focal
 tomcat:9.0.91-jre11-temurin-jammy
+tomcat:9.0.91-jre11-temurin-noble
 tomcat:9.0.91-jre17
 tomcat:9.0.91-jre17-temurin
-tomcat:9.0.91-jre17-temurin-focal
 tomcat:9.0.91-jre17-temurin-jammy
+tomcat:9.0.91-jre17-temurin-noble
 tomcat:9.0.91-jre21
 tomcat:9.0.91-jre21-temurin
 tomcat:9.0.91-jre21-temurin-jammy
+tomcat:9.0.91-jre21-temurin-noble
 tomcat:10
 tomcat:10-jdk11
 tomcat:10-jdk11-temurin
 tomcat:10-jdk11-temurin-jammy
+tomcat:10-jdk11-temurin-noble
 tomcat:10-jdk17
 tomcat:10-jdk17-temurin
 tomcat:10-jdk17-temurin-jammy
+tomcat:10-jdk17-temurin-noble
 tomcat:10-jdk21
 tomcat:10-jdk21-temurin
 tomcat:10-jdk21-temurin-jammy
+tomcat:10-jdk21-temurin-noble
 tomcat:10-jre11
 tomcat:10-jre11-temurin
 tomcat:10-jre11-temurin-jammy
+tomcat:10-jre11-temurin-noble
 tomcat:10-jre17
 tomcat:10-jre17-temurin
 tomcat:10-jre17-temurin-jammy
+tomcat:10-jre17-temurin-noble
 tomcat:10-jre21
 tomcat:10-jre21-temurin
 tomcat:10-jre21-temurin-jammy
+tomcat:10-jre21-temurin-noble
 tomcat:10.1
 tomcat:10.1-jdk11
 tomcat:10.1-jdk11-temurin
 tomcat:10.1-jdk11-temurin-jammy
+tomcat:10.1-jdk11-temurin-noble
 tomcat:10.1-jdk17
 tomcat:10.1-jdk17-temurin
 tomcat:10.1-jdk17-temurin-jammy
+tomcat:10.1-jdk17-temurin-noble
 tomcat:10.1-jdk21
 tomcat:10.1-jdk21-temurin
 tomcat:10.1-jdk21-temurin-jammy
+tomcat:10.1-jdk21-temurin-noble
 tomcat:10.1-jre11
 tomcat:10.1-jre11-temurin
 tomcat:10.1-jre11-temurin-jammy
+tomcat:10.1-jre11-temurin-noble
 tomcat:10.1-jre17
 tomcat:10.1-jre17-temurin
 tomcat:10.1-jre17-temurin-jammy
+tomcat:10.1-jre17-temurin-noble
 tomcat:10.1-jre21
 tomcat:10.1-jre21-temurin
 tomcat:10.1-jre21-temurin-jammy
+tomcat:10.1-jre21-temurin-noble
 tomcat:10.1.26
 tomcat:10.1.26-jdk11
 tomcat:10.1.26-jdk11-temurin
 tomcat:10.1.26-jdk11-temurin-jammy
+tomcat:10.1.26-jdk11-temurin-noble
 tomcat:10.1.26-jdk17
 tomcat:10.1.26-jdk17-temurin
 tomcat:10.1.26-jdk17-temurin-jammy
+tomcat:10.1.26-jdk17-temurin-noble
 tomcat:10.1.26-jdk21
 tomcat:10.1.26-jdk21-temurin
 tomcat:10.1.26-jdk21-temurin-jammy
+tomcat:10.1.26-jdk21-temurin-noble
 tomcat:10.1.26-jre11
 tomcat:10.1.26-jre11-temurin
 tomcat:10.1.26-jre11-temurin-jammy
+tomcat:10.1.26-jre11-temurin-noble
 tomcat:10.1.26-jre17
 tomcat:10.1.26-jre17-temurin
 tomcat:10.1.26-jre17-temurin-jammy
+tomcat:10.1.26-jre17-temurin-noble
 tomcat:10.1.26-jre21
 tomcat:10.1.26-jre21-temurin
 tomcat:10.1.26-jre21-temurin-jammy
+tomcat:10.1.26-jre21-temurin-noble
 tomcat:11.0
 tomcat:11.0-jdk21
 tomcat:11.0-jdk21-temurin
 tomcat:11.0-jdk21-temurin-jammy
+tomcat:11.0-jdk21-temurin-noble
 tomcat:11.0-jre21
 tomcat:11.0-jre21-temurin
 tomcat:11.0-jre21-temurin-jammy
+tomcat:11.0-jre21-temurin-noble
 tomcat:11.0.0
 tomcat:11.0.0-M22
 tomcat:11.0.0-M22-jdk21
 tomcat:11.0.0-M22-jdk21-temurin
 tomcat:11.0.0-M22-jdk21-temurin-jammy
+tomcat:11.0.0-M22-jdk21-temurin-noble
 tomcat:11.0.0-M22-jre21
 tomcat:11.0.0-M22-jre21-temurin
 tomcat:11.0.0-M22-jre21-temurin-jammy
+tomcat:11.0.0-M22-jre21-temurin-noble
 tomcat:11.0.0-jdk21
 tomcat:11.0.0-jdk21-temurin
 tomcat:11.0.0-jdk21-temurin-jammy
+tomcat:11.0.0-jdk21-temurin-noble
 tomcat:11.0.0-jre21
 tomcat:11.0.0-jre21-temurin
 tomcat:11.0.0-jre21-temurin-jammy
+tomcat:11.0.0-jre21-temurin-noble
 tomcat:jdk11
 tomcat:jdk11-temurin
 tomcat:jdk11-temurin-jammy
+tomcat:jdk11-temurin-noble
 tomcat:jdk17
 tomcat:jdk17-temurin
 tomcat:jdk17-temurin-jammy
+tomcat:jdk17-temurin-noble
 tomcat:jdk21
 tomcat:jdk21-temurin
 tomcat:jdk21-temurin-jammy
+tomcat:jdk21-temurin-noble
 tomcat:jre11
 tomcat:jre11-temurin
 tomcat:jre11-temurin-jammy
+tomcat:jre11-temurin-noble
 tomcat:jre17
 tomcat:jre17-temurin
 tomcat:jre17-temurin-jammy
+tomcat:jre17-temurin-noble
 tomcat:jre21
 tomcat:jre21-temurin
 tomcat:jre21-temurin-jammy
+tomcat:jre21-temurin-noble
 tomcat:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 83c3997..44e38e2 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,26 +1,36 @@
 tomcat:9
 tomcat:9-jdk8
 tomcat:9-jdk8-corretto
-tomcat:9-jdk8-temurin-focal
+tomcat:9-jdk8-temurin-jammy
 tomcat:9-jdk11
 tomcat:9-jdk11-corretto
-tomcat:9-jdk11-temurin-focal
+tomcat:9-jdk11-temurin-jammy
 tomcat:9-jdk17
 tomcat:9-jdk17-corretto
-tomcat:9-jdk17-temurin-focal
+tomcat:9-jdk17-temurin-jammy
 tomcat:9-jdk21-corretto
+tomcat:9-jdk21-temurin-jammy
 tomcat:9-jre8
-tomcat:9-jre8-temurin-focal
+tomcat:9-jre8-temurin-jammy
 tomcat:9-jre11
-tomcat:9-jre11-temurin-focal
+tomcat:9-jre11-temurin-jammy
 tomcat:9-jre17
-tomcat:9-jre17-temurin-focal
+tomcat:9-jre17-temurin-jammy
 tomcat:9-jre21
+tomcat:9-jre21-temurin-jammy
 tomcat:11.0
+tomcat:11.0-jdk21-temurin-jammy
 tomcat:11.0-jre21
+tomcat:11.0-jre21-temurin-jammy
 tomcat:jdk11
+tomcat:jdk11-temurin-jammy
 tomcat:jdk17
+tomcat:jdk17-temurin-jammy
+tomcat:jdk21-temurin-jammy
 tomcat:jre11
+tomcat:jre11-temurin-jammy
 tomcat:jre17
+tomcat:jre17-temurin-jammy
+tomcat:jre21-temurin-jammy
 tomcat:latest
 tomcat:jre21
diff --git a/tomcat_11.0/Dockerfile b/tomcat_11.0-jdk21-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_11.0/Dockerfile
copy to tomcat_11.0-jdk21-temurin-jammy/Dockerfile
diff --git a/tomcat_11.0-jre21/Dockerfile b/tomcat_11.0-jre21-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_11.0-jre21/Dockerfile
copy to tomcat_11.0-jre21-temurin-jammy/Dockerfile
diff --git a/tomcat_11.0-jre21/Dockerfile b/tomcat_11.0-jre21/Dockerfile
index 16fa35b..fa213b2 100644
--- a/tomcat_11.0-jre21/Dockerfile
+++ b/tomcat_11.0-jre21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:21-jre-jammy
+FROM eclipse-temurin:21-jre-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 11
 ENV TOMCAT_VERSION 11.0.0-M22
 ENV TOMCAT_SHA512 a6d41340304a8e2b48677b6043badcc28cf336b995107b6b08b71a8a9fe9da07628e6cef4ca60795d15d3c0744833fc96707e6ecf696942443cadab92301735f
 
-COPY --from=tomcat:11.0.0-M22-jdk21-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:11.0.0-M22-jdk21-temurin-noble $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_11.0/Dockerfile b/tomcat_11.0/Dockerfile
index ea54416..b1c6c15 100644
--- a/tomcat_11.0/Dockerfile
+++ b/tomcat_11.0/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:21-jdk-jammy
+FROM eclipse-temurin:21-jdk-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_9-jdk11-temurin-focal/Dockerfile b/tomcat_9-jdk11-temurin-focal/Dockerfile
deleted file mode 100644
index 8e0634b..0000000
diff --git a/tomcat_9-jdk11/Dockerfile b/tomcat_9-jdk11-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_9-jdk11/Dockerfile
copy to tomcat_9-jdk11-temurin-jammy/Dockerfile
diff --git a/tomcat_9-jdk11/Dockerfile b/tomcat_9-jdk11/Dockerfile
index 1a66dae..040d1d2 100644
--- a/tomcat_9-jdk11/Dockerfile
+++ b/tomcat_9-jdk11/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:11-jdk-jammy
+FROM eclipse-temurin:11-jdk-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_9-jdk17-temurin-focal/Dockerfile b/tomcat_9-jdk17-temurin-focal/Dockerfile
deleted file mode 100644
index f8f51c5..0000000
diff --git a/tomcat_9-jdk17/Dockerfile b/tomcat_9-jdk17-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_9-jdk17/Dockerfile
copy to tomcat_9-jdk17-temurin-jammy/Dockerfile
diff --git a/tomcat_9-jdk17/Dockerfile b/tomcat_9-jdk17/Dockerfile
index 4c44b28..13f8424 100644
--- a/tomcat_9-jdk17/Dockerfile
+++ b/tomcat_9-jdk17/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:17-jdk-jammy
+FROM eclipse-temurin:17-jdk-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_9/Dockerfile b/tomcat_9-jdk21-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_9/Dockerfile
copy to tomcat_9-jdk21-temurin-jammy/Dockerfile
diff --git a/tomcat_9-jdk8-temurin-focal/Dockerfile b/tomcat_9-jdk8-temurin-focal/Dockerfile
deleted file mode 100644
index a00e3b6..0000000
diff --git a/tomcat_9-jdk8/Dockerfile b/tomcat_9-jdk8-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_9-jdk8/Dockerfile
copy to tomcat_9-jdk8-temurin-jammy/Dockerfile
diff --git a/tomcat_9-jdk8/Dockerfile b/tomcat_9-jdk8/Dockerfile
index a1c7bea..668039f 100644
--- a/tomcat_9-jdk8/Dockerfile
+++ b/tomcat_9-jdk8/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:8-jdk-jammy
+FROM eclipse-temurin:8-jdk-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_9-jre11-temurin-focal/Dockerfile b/tomcat_9-jre11-temurin-focal/Dockerfile
deleted file mode 100644
index 9d322b7..0000000
diff --git a/tomcat_9-jre11/Dockerfile b/tomcat_9-jre11-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_9-jre11/Dockerfile
copy to tomcat_9-jre11-temurin-jammy/Dockerfile
diff --git a/tomcat_9-jre11/Dockerfile b/tomcat_9-jre11/Dockerfile
index 99ea2a8..c0707b6 100644
--- a/tomcat_9-jre11/Dockerfile
+++ b/tomcat_9-jre11/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:11-jre-jammy
+FROM eclipse-temurin:11-jre-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 9
 ENV TOMCAT_VERSION 9.0.91
 ENV TOMCAT_SHA512 b22054c9141782232a693765d23d944f0f50774af17dd8968331e020b425e71459b5877a7ba8c2121246a5ce47e6b6a31c3f4215ef133e942da45b49cb534948
 
-COPY --from=tomcat:9.0.91-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.91-jdk11-temurin-noble $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
deleted file mode 100644
index 56544bf..0000000
diff --git a/tomcat_9-jre17/Dockerfile b/tomcat_9-jre17-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_9-jre17/Dockerfile
copy to tomcat_9-jre17-temurin-jammy/Dockerfile
diff --git a/tomcat_9-jre17/Dockerfile b/tomcat_9-jre17/Dockerfile
index 7bb3ab1..a0d3534 100644
--- a/tomcat_9-jre17/Dockerfile
+++ b/tomcat_9-jre17/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:17-jre-jammy
+FROM eclipse-temurin:17-jre-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 9
 ENV TOMCAT_VERSION 9.0.91
 ENV TOMCAT_SHA512 b22054c9141782232a693765d23d944f0f50774af17dd8968331e020b425e71459b5877a7ba8c2121246a5ce47e6b6a31c3f4215ef133e942da45b49cb534948
 
-COPY --from=tomcat:9.0.91-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.91-jdk17-temurin-noble $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-jre21/Dockerfile b/tomcat_9-jre21-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_9-jre21/Dockerfile
copy to tomcat_9-jre21-temurin-jammy/Dockerfile
diff --git a/tomcat_9-jre21/Dockerfile b/tomcat_9-jre21/Dockerfile
index 89876d8..ba39113 100644
--- a/tomcat_9-jre21/Dockerfile
+++ b/tomcat_9-jre21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:21-jre-jammy
+FROM eclipse-temurin:21-jre-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 9
 ENV TOMCAT_VERSION 9.0.91
 ENV TOMCAT_SHA512 b22054c9141782232a693765d23d944f0f50774af17dd8968331e020b425e71459b5877a7ba8c2121246a5ce47e6b6a31c3f4215ef133e942da45b49cb534948
 
-COPY --from=tomcat:9.0.91-jdk21-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.91-jdk21-temurin-noble $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
deleted file mode 100644
index 4ea8b2f..0000000
diff --git a/tomcat_9-jre8/Dockerfile b/tomcat_9-jre8-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_9-jre8/Dockerfile
copy to tomcat_9-jre8-temurin-jammy/Dockerfile
diff --git a/tomcat_9-jre8/Dockerfile b/tomcat_9-jre8/Dockerfile
index 48d5d66..2bdb253 100644
--- a/tomcat_9-jre8/Dockerfile
+++ b/tomcat_9-jre8/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:8-jre-jammy
+FROM eclipse-temurin:8-jre-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 9
 ENV TOMCAT_VERSION 9.0.91
 ENV TOMCAT_SHA512 b22054c9141782232a693765d23d944f0f50774af17dd8968331e020b425e71459b5877a7ba8c2121246a5ce47e6b6a31c3f4215ef133e942da45b49cb534948
 
-COPY --from=tomcat:9.0.91-jdk8-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.91-jdk8-temurin-noble $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 07e5694..5afe356 100644
--- a/tomcat_9/Dockerfile
+++ b/tomcat_9/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:21-jdk-jammy
+FROM eclipse-temurin:21-jdk-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_jdk11/Dockerfile b/tomcat_jdk11-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_jdk11/Dockerfile
copy to tomcat_jdk11-temurin-jammy/Dockerfile
diff --git a/tomcat_jdk11/Dockerfile b/tomcat_jdk11/Dockerfile
index a7f320b..5ee2f98 100644
--- a/tomcat_jdk11/Dockerfile
+++ b/tomcat_jdk11/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:11-jdk-jammy
+FROM eclipse-temurin:11-jdk-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_jdk17/Dockerfile b/tomcat_jdk17-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_jdk17/Dockerfile
copy to tomcat_jdk17-temurin-jammy/Dockerfile
diff --git a/tomcat_jdk17/Dockerfile b/tomcat_jdk17/Dockerfile
index b2e27fb..6a1cad6 100644
--- a/tomcat_jdk17/Dockerfile
+++ b/tomcat_jdk17/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:17-jdk-jammy
+FROM eclipse-temurin:17-jdk-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_latest/Dockerfile b/tomcat_jdk21-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_latest/Dockerfile
copy to tomcat_jdk21-temurin-jammy/Dockerfile
diff --git a/tomcat_jre11/Dockerfile b/tomcat_jre11-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_jre11/Dockerfile
copy to tomcat_jre11-temurin-jammy/Dockerfile
diff --git a/tomcat_jre11/Dockerfile b/tomcat_jre11/Dockerfile
index 4c53bed..6f84006 100644
--- a/tomcat_jre11/Dockerfile
+++ b/tomcat_jre11/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:11-jre-jammy
+FROM eclipse-temurin:11-jre-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 10
 ENV TOMCAT_VERSION 10.1.26
 ENV TOMCAT_SHA512 0a62e55c1ff9f8f04d7aff938764eac46c289eda888abf43de74a82ceb7d879e94a36ea3e5e46186bc231f07871fcc4c58f11e026f51d4487a473badb21e9355
 
-COPY --from=tomcat:10.1.26-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.26-jdk11-temurin-noble $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_jre17/Dockerfile b/tomcat_jre17-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_jre17/Dockerfile
copy to tomcat_jre17-temurin-jammy/Dockerfile
diff --git a/tomcat_jre17/Dockerfile b/tomcat_jre17/Dockerfile
index cc21173..a6e8278 100644
--- a/tomcat_jre17/Dockerfile
+++ b/tomcat_jre17/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:17-jre-jammy
+FROM eclipse-temurin:17-jre-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 10
 ENV TOMCAT_VERSION 10.1.26
 ENV TOMCAT_SHA512 0a62e55c1ff9f8f04d7aff938764eac46c289eda888abf43de74a82ceb7d879e94a36ea3e5e46186bc231f07871fcc4c58f11e026f51d4487a473badb21e9355
 
-COPY --from=tomcat:10.1.26-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.26-jdk17-temurin-noble $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_jre21/Dockerfile b/tomcat_jre21-temurin-jammy/Dockerfile
similarity index 100%
copy from tomcat_jre21/Dockerfile
copy to tomcat_jre21-temurin-jammy/Dockerfile
diff --git a/tomcat_jre21/Dockerfile b/tomcat_jre21/Dockerfile
index 6a9af47..1ccafdf 100644
--- a/tomcat_jre21/Dockerfile
+++ b/tomcat_jre21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:21-jre-jammy
+FROM eclipse-temurin:21-jre-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 10
 ENV TOMCAT_VERSION 10.1.26
 ENV TOMCAT_SHA512 0a62e55c1ff9f8f04d7aff938764eac46c289eda888abf43de74a82ceb7d879e94a36ea3e5e46186bc231f07871fcc4c58f11e026f51d4487a473badb21e9355
 
-COPY --from=tomcat:10.1.26-jdk21-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.26-jdk21-temurin-noble $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_latest/Dockerfile b/tomcat_latest/Dockerfile
index 65f7eb5..f5de22c 100644
--- a/tomcat_latest/Dockerfile
+++ b/tomcat_latest/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM eclipse-temurin:21-jdk-jammy
+FROM eclipse-temurin:21-jdk-noble
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH

Relevant Maintainers:

• tomcat: @tianon @yosifkit