Skip to content

Update for Corretto releases: 8.502.07.1, 11.0.32.9.1, 17.0.20.8.1, 21.0.12.8.1, 25.0.4.7.1, 26.0.2.10.1#21894

Open
mmm-choi wants to merge 2 commits into
docker-library:masterfrom
mmm-choi:12523
Open

Update for Corretto releases: 8.502.07.1, 11.0.32.9.1, 17.0.20.8.1, 21.0.12.8.1, 25.0.4.7.1, 26.0.2.10.1#21894
mmm-choi wants to merge 2 commits into
docker-library:masterfrom
mmm-choi:12523

Conversation

@mmm-choi

@mmm-choi mmm-choi commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

Update amazoncorretto for latest release. For more details, see the following:

Starting with this release, the default Amazon Corretto Docker images are based on Amazon Linux 2023. Amazon Linux 2 images will continue to be provided as non-default options for customers who cannot yet migrate.

@mmm-choi
mmm-choi requested a review from a team as a code owner July 22, 2026 03:13
@mmm-choi mmm-choi changed the title Update for release 8.502.07.1, 11.0.32.9.1, 17.0.20.8.1, 21.0.12.8.1, 25.0.4.7.1, 26.0.2.10.1 Update for Corretto releases: 8.502.07.1, 11.0.32.9.1, 17.0.20.8.1, 21.0.12.8.1, 25.0.4.7.1, 26.0.2.10.1 Jul 22, 2026
@github-actions

This comment has been minimized.

Sign in to view
@mmm-choi mmm-choi mentioned this pull request Jul 22, 2026
Merged
@github-actions

github-actions Bot commented Jul 22, 2026

Copy link
Copy Markdown
Diff for 42ebaf6: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9f90762..3c3f9eb 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,224 +1,228 @@
 Maintainers: Amazon Corretto Team <corretto-team@amazon.com> (@corretto), Dan Lutker <lutkerd@amazon.com> (@lutkerd), Ben Taylor <benty@amazon.com> (@benty-amzn), David Alvarez <alvdavi@amazon.com> (@alvdavi), Rui Li <ruiamzn@amazon.com> (@rgithubli), Sergey Bylokhov <bylokhov@amazon.com> (@mrserb), Victor Rudometov <vicrud@amazon.com> (@Rudometov), Elif Aslan <elifasln@amazon.com> (@elifaslan1), Chad Rakoczy <chadrako@amazon.com> (@chadrako), Ian Myers <ianrichr@amazon.com> (@ianrichr), John Spurling <spurn@amazon.com> (@synecdoche), Daniel Hu <costmuch@amazon.com> (@cost0much), Michael De Vera <mldevera@amazon.com> (@midver), Min Choi <minschoi@amazon.com> (@mmm-choi), Satyen Subramaniam <satyenme@amazon.com> (@satyenme)
 GitRepo: https://github.com/corretto/corretto-docker.git
 GitFetch: refs/heads/main
-GitCommit: b8045df4f76b173c45f9499ca5aa5a82c591a993
+GitCommit: a4a86adc91afa6ae78207899cd01bd88c9b46322
 
-Tags: 8, 8u492, 8u492-al2, 8-al2-full, 8-al2-jdk, 8-al2-generic, 8u492-al2-generic, 8-al2-generic-jdk, latest
+Tags: 8-al2, 8u502-al2, 8-al2-full, 8-al2-jdk, 8-al2-generic, 8u502-al2-generic, 8-al2-generic-jdk
 Architectures: amd64, arm64v8
 Directory: 8/jdk/al2-generic
 
-Tags: 8-al2-native-jdk, 8u492-al2-native-jdk
+Tags: 8-al2-native-jdk, 8u502-al2-native-jdk
 Architectures: amd64, arm64v8
 Directory: 8/jdk/al2
 
-Tags: 8-al2-native-jre, 8u492-al2-native-jre
+Tags: 8-al2-native-jre, 8u502-al2-native-jre
 Architectures: amd64, arm64v8
 Directory: 8/jre/al2
 
-Tags: 8-al2023, 8u492-al2023, 8-al2023-jdk, 8-al2023-jre, 8u492-al2023-jre
+Tags: 8-al2023, 8u502-al2023, 8-al2023-jdk, 8, 8-jdk, 8u502, latest
 Architectures: amd64, arm64v8
 Directory: 8/jdk/al2023
 
-Tags: 8-alpine3.21, 8u492-alpine3.21, 8-alpine3.21-full, 8-alpine3.21-jdk
+Tags: 8-al2023-jre, 8u502-al2023-jre, 8-jre
+Architectures: amd64, arm64v8
+Directory: 8/jre/al2023
+
+Tags: 8-alpine3.21, 8u502-alpine3.21, 8-alpine3.21-full, 8-alpine3.21-jdk
 Architectures: amd64, arm64v8
 Directory: 8/jdk/alpine/3.21
 
-Tags: 8-alpine3.21-jre, 8u492-alpine3.21-jre
+Tags: 8-alpine3.21-jre, 8u502-alpine3.21-jre
 Architectures: amd64, arm64v8
 Directory: 8/jre/alpine/3.21
 
-Tags: 8-alpine3.22, 8u492-alpine3.22, 8-alpine3.22-full, 8-alpine3.22-jdk
+Tags: 8-alpine3.22, 8u502-alpine3.22, 8-alpine3.22-full, 8-alpine3.22-jdk
 Architectures: amd64, arm64v8
 Directory: 8/jdk/alpine/3.22
 
-Tags: 8-alpine3.22-jre, 8u492-alpine3.22-jre
+Tags: 8-alpine3.22-jre, 8u502-alpine3.22-jre
 Architectures: amd64, arm64v8
 Directory: 8/jre/alpine/3.22
 
-Tags: 8-alpine3.23, 8u492-alpine3.23, 8-alpine3.23-full, 8-alpine3.23-jdk
+Tags: 8-alpine3.23, 8u502-alpine3.23, 8-alpine3.23-full, 8-alpine3.23-jdk
 Architectures: amd64, arm64v8
 Directory: 8/jdk/alpine/3.23
 
-Tags: 8-alpine3.23-jre, 8u492-alpine3.23-jre
+Tags: 8-alpine3.23-jre, 8u502-alpine3.23-jre
 Architectures: amd64, arm64v8
 Directory: 8/jre/alpine/3.23
 
-Tags: 8-alpine3.24, 8u492-alpine3.24, 8-alpine3.24-full, 8-alpine3.24-jdk, 8-alpine, 8u492-alpine, 8-alpine-full, 8-alpine-jdk
+Tags: 8-alpine3.24, 8u502-alpine3.24, 8-alpine3.24-full, 8-alpine3.24-jdk, 8-alpine, 8u502-alpine, 8-alpine-full, 8-alpine-jdk
 Architectures: amd64, arm64v8
 Directory: 8/jdk/alpine/3.24
 
-Tags: 8-alpine3.24-jre, 8u492-alpine3.24-jre, 8-alpine-jre, 8u492-alpine-jre
+Tags: 8-alpine3.24-jre, 8u502-alpine3.24-jre, 8-alpine-jre, 8u502-alpine-jre
 Architectures: amd64, arm64v8
 Directory: 8/jre/alpine/3.24
 
-Tags: 11, 11.0.31, 11.0.31-al2, 11-al2-full, 11-al2-jdk, 11-al2-generic, 11.0.31-al2-generic, 11-al2-generic-jdk
+Tags: 11-al2, 11.0.32-al2, 11-al2-full, 11-al2-jdk, 11-al2-generic, 11.0.32-al2-generic, 11-al2-generic-jdk
 Architectures: amd64, arm64v8
 Directory: 11/jdk/al2-generic
 
-Tags: 11-al2-native-headless, 11.0.31-al2-native-headless
+Tags: 11-al2-native-headless, 11.0.32-al2-native-headless
 Architectures: amd64, arm64v8
 Directory: 11/headless/al2
 
-Tags: 11-al2-native-jdk, 11.0.31-al2-native-jdk
+Tags: 11-al2-native-jdk, 11.0.32-al2-native-jdk
 Architectures: amd64, arm64v8
 Directory: 11/jdk/al2
 
-Tags: 11-al2023, 11.0.31-al2023, 11-al2023-jdk
+Tags: 11-al2023, 11.0.32-al2023, 11-al2023-jdk, 11, 11-jdk, 11.0.32
 Architectures: amd64, arm64v8
 Directory: 11/jdk/al2023
 
-Tags: 11-al2023-headful, 11.0.31-al2023-headful
+Tags: 11-al2023-headful, 11.0.32-al2023-headful, 11-headful
 Architectures: amd64, arm64v8
 Directory: 11/headful/al2023
 
-Tags: 11-al2023-headless, 11.0.31-al2023-headless
+Tags: 11-al2023-headless, 11.0.32-al2023-headless, 11-headless
 Architectures: amd64, arm64v8
 Directory: 11/headless/al2023
 
-Tags: 11-alpine3.21, 11.0.31-alpine3.21, 11-alpine3.21-full, 11-alpine3.21-jdk
+Tags: 11-alpine3.21, 11.0.32-alpine3.21, 11-alpine3.21-full, 11-alpine3.21-jdk
 Architectures: amd64, arm64v8
 Directory: 11/jdk/alpine/3.21
 
-Tags: 11-alpine3.22, 11.0.31-alpine3.22, 11-alpine3.22-full, 11-alpine3.22-jdk
+Tags: 11-alpine3.22, 11.0.32-alpine3.22, 11-alpine3.22-full, 11-alpine3.22-jdk
 Architectures: amd64, arm64v8
 Directory: 11/jdk/alpine/3.22
 
-Tags: 11-alpine3.23, 11.0.31-alpine3.23, 11-alpine3.23-full, 11-alpine3.23-jdk
+Tags: 11-alpine3.23, 11.0.32-alpine3.23, 11-alpine3.23-full, 11-alpine3.23-jdk
 Architectures: amd64, arm64v8
 Directory: 11/jdk/alpine/3.23
 
-Tags: 11-alpine3.24, 11.0.31-alpine3.24, 11-alpine3.24-full, 11-alpine3.24-jdk, 11-alpine, 11.0.31-alpine, 11-alpine-full, 11-alpine-jdk
+Tags: 11-alpine3.24, 11.0.32-alpine3.24, 11-alpine3.24-full, 11-alpine3.24-jdk, 11-alpine, 11.0.32-alpine, 11-alpine-full, 11-alpine-jdk
 Architectures: amd64, arm64v8
 Directory: 11/jdk/alpine/3.24
 
-Tags: 17, 17.0.19, 17.0.19-al2, 17-al2-full, 17-al2-jdk, 17-al2-generic, 17.0.19-al2-generic, 17-al2-generic-jdk
+Tags: 17-al2, 17.0.20-al2, 17-al2-full, 17-al2-jdk, 17-al2-generic, 17.0.20-al2-generic, 17-al2-generic-jdk
 Architectures: amd64, arm64v8
 Directory: 17/jdk/al2-generic
 
-Tags: 17-al2-native-headful, 17.0.19-al2-native-headful
+Tags: 17-al2-native-headful, 17.0.20-al2-native-headful
 Architectures: amd64, arm64v8
 Directory: 17/headful/al2
 
-Tags: 17-al2-native-headless, 17.0.19-al2-native-headless
+Tags: 17-al2-native-headless, 17.0.20-al2-native-headless
 Architectures: amd64, arm64v8
 Directory: 17/headless/al2
 
-Tags: 17-al2-native-jdk, 17.0.19-al2-native-jdk
+Tags: 17-al2-native-jdk, 17.0.20-al2-native-jdk
 Architectures: amd64, arm64v8
 Directory: 17/jdk/al2
 
-Tags: 17-al2023, 17.0.19-al2023, 17-al2023-jdk
+Tags: 17-al2023, 17.0.20-al2023, 17-al2023-jdk, 17, 17-jdk, 17.0.20
 Architectures: amd64, arm64v8
 Directory: 17/jdk/al2023
 
-Tags: 17-al2023-headful, 17.0.19-al2023-headful
+Tags: 17-al2023-headful, 17.0.20-al2023-headful, 17-headful
 Architectures: amd64, arm64v8
 Directory: 17/headful/al2023
 
-Tags: 17-al2023-headless, 17.0.19-al2023-headless
+Tags: 17-al2023-headless, 17.0.20-al2023-headless, 17-headless
 Architectures: amd64, arm64v8
 Directory: 17/headless/al2023
 
-Tags: 17-alpine3.21, 17.0.19-alpine3.21, 17-alpine3.21-full, 17-alpine3.21-jdk
+Tags: 17-alpine3.21, 17.0.20-alpine3.21, 17-alpine3.21-full, 17-alpine3.21-jdk
 Architectures: amd64, arm64v8
 Directory: 17/jdk/alpine/3.21
 
-Tags: 17-alpine3.22, 17.0.19-alpine3.22, 17-alpine3.22-full, 17-alpine3.22-jdk
+Tags: 17-alpine3.22, 17.0.20-alpine3.22, 17-alpine3.22-full, 17-alpine3.22-jdk
 Architectures: amd64, arm64v8
 Directory: 17/jdk/alpine/3.22
 
-Tags: 17-alpine3.23, 17.0.19-alpine3.23, 17-alpine3.23-full, 17-alpine3.23-jdk
+Tags: 17-alpine3.23, 17.0.20-alpine3.23, 17-alpine3.23-full, 17-alpine3.23-jdk
 Architectures: amd64, arm64v8
 Directory: 17/jdk/alpine/3.23
 
-Tags: 17-alpine3.24, 17.0.19-alpine3.24, 17-alpine3.24-full, 17-alpine3.24-jdk, 17-alpine, 17.0.19-alpine, 17-alpine-full, 17-alpine-jdk
+Tags: 17-alpine3.24, 17.0.20-alpine3.24, 17-alpine3.24-full, 17-alpine3.24-jdk, 17-alpine, 17.0.20-alpine, 17-alpine-full, 17-alpine-jdk
 Architectures: amd64, arm64v8
 Directory: 17/jdk/alpine/3.24
 
-Tags: 21, 21.0.11, 21.0.11-al2, 21-al2-full, 21-al2-jdk, 21-al2-generic, 21.0.11-al2-generic, 21-al2-generic-jdk
+Tags: 21-al2, 21.0.12-al2, 21-al2-full, 21-al2-jdk, 21-al2-generic, 21.0.12-al2-generic, 21-al2-generic-jdk
 Architectures: amd64, arm64v8
 Directory: 21/jdk/al2-generic
 
-Tags: 21-al2023, 21.0.11-al2023, 21-al2023-jdk
+Tags: 21-al2023, 21.0.12-al2023, 21-al2023-jdk, 21, 21-jdk, 21.0.12
 Architectures: amd64, arm64v8
 Directory: 21/jdk/al2023
 
-Tags: 21-al2023-headful, 21.0.11-al2023-headful
+Tags: 21-al2023-headful, 21.0.12-al2023-headful, 21-headful
 Architectures: amd64, arm64v8
 Directory: 21/headful/al2023
 
-Tags: 21-al2023-headless, 21.0.11-al2023-headless
+Tags: 21-al2023-headless, 21.0.12-al2023-headless, 21-headless
 Architectures: amd64, arm64v8
 Directory: 21/headless/al2023
 
-Tags: 21-alpine3.21, 21.0.11-alpine3.21, 21-alpine3.21-full, 21-alpine3.21-jdk
+Tags: 21-alpine3.21, 21.0.12-alpine3.21, 21-alpine3.21-full, 21-alpine3.21-jdk
 Architectures: amd64, arm64v8
 Directory: 21/jdk/alpine/3.21
 
-Tags: 21-alpine3.22, 21.0.11-alpine3.22, 21-alpine3.22-full, 21-alpine3.22-jdk
+Tags: 21-alpine3.22, 21.0.12-alpine3.22, 21-alpine3.22-full, 21-alpine3.22-jdk
 Architectures: amd64, arm64v8
 Directory: 21/jdk/alpine/3.22
 
-Tags: 21-alpine3.23, 21.0.11-alpine3.23, 21-alpine3.23-full, 21-alpine3.23-jdk
+Tags: 21-alpine3.23, 21.0.12-alpine3.23, 21-alpine3.23-full, 21-alpine3.23-jdk
 Architectures: amd64, arm64v8
 Directory: 21/jdk/alpine/3.23
 
-Tags: 21-alpine3.24, 21.0.11-alpine3.24, 21-alpine3.24-full, 21-alpine3.24-jdk, 21-alpine, 21.0.11-alpine, 21-alpine-full, 21-alpine-jdk
+Tags: 21-alpine3.24, 21.0.12-alpine3.24, 21-alpine3.24-full, 21-alpine3.24-jdk, 21-alpine, 21.0.12-alpine, 21-alpine-full, 21-alpine-jdk
 Architectures: amd64, arm64v8
 Directory: 21/jdk/alpine/3.24
 
-Tags: 25-al2023, 25.0.3-al2023, 25-al2023-jdk, 25, 25-jdk, 25.0.3
+Tags: 25-al2023, 25.0.4-al2023, 25-al2023-jdk, 25, 25-jdk, 25.0.4
 Architectures: amd64, arm64v8
 Directory: 25/jdk/al2023
 
-Tags: 25-al2023-headful, 25.0.3-al2023-headful, 25-headful
+Tags: 25-al2023-headful, 25.0.4-al2023-headful, 25-headful
 Architectures: amd64, arm64v8
 Directory: 25/headful/al2023
 
-Tags: 25-al2023-headless, 25.0.3-al2023-headless, 25-headless
+Tags: 25-al2023-headless, 25.0.4-al2023-headless, 25-headless
 Architectures: amd64, arm64v8
 Directory: 25/headless/al2023
 
-Tags: 25-alpine3.21, 25.0.3-alpine3.21, 25-alpine3.21-full, 25-alpine3.21-jdk
+Tags: 25-alpine3.21, 25.0.4-alpine3.21, 25-alpine3.21-full, 25-alpine3.21-jdk
 Architectures: amd64, arm64v8
 Directory: 25/jdk/alpine/3.21
 
-Tags: 25-alpine3.22, 25.0.3-alpine3.22, 25-alpine3.22-full, 25-alpine3.22-jdk
+Tags: 25-alpine3.22, 25.0.4-alpine3.22, 25-alpine3.22-full, 25-alpine3.22-jdk
 Architectures: amd64, arm64v8
 Directory: 25/jdk/alpine/3.22
 
-Tags: 25-alpine3.23, 25.0.3-alpine3.23, 25-alpine3.23-full, 25-alpine3.23-jdk
+Tags: 25-alpine3.23, 25.0.4-alpine3.23, 25-alpine3.23-full, 25-alpine3.23-jdk
 Architectures: amd64, arm64v8
 Directory: 25/jdk/alpine/3.23
 
-Tags: 25-alpine3.24, 25.0.3-alpine3.24, 25-alpine3.24-full, 25-alpine3.24-jdk, 25-alpine, 25.0.3-alpine, 25-alpine-full, 25-alpine-jdk
+Tags: 25-alpine3.24, 25.0.4-alpine3.24, 25-alpine3.24-full, 25-alpine3.24-jdk, 25-alpine, 25.0.4-alpine, 25-alpine-full, 25-alpine-jdk
 Architectures: amd64, arm64v8
 Directory: 25/jdk/alpine/3.24
 
-Tags: 26-al2023, 26.0.1-al2023, 26-al2023-jdk, 26, 26-jdk, 26.0.1
+Tags: 26-al2023, 26.0.2-al2023, 26-al2023-jdk, 26, 26-jdk, 26.0.2
 Architectures: amd64, arm64v8
 Directory: 26/jdk/al2023
 
-Tags: 26-al2023-headful, 26.0.1-al2023-headful, 26-headful
+Tags: 26-al2023-headful, 26.0.2-al2023-headful, 26-headful
 Architectures: amd64, arm64v8
 Directory: 26/headful/al2023
 
-Tags: 26-al2023-headless, 26.0.1-al2023-headless, 26-headless
+Tags: 26-al2023-headless, 26.0.2-al2023-headless, 26-headless
 Architectures: amd64, arm64v8
 Directory: 26/headless/al2023
 
-Tags: 26-alpine3.21, 26.0.1-alpine3.21, 26-alpine3.21-full, 26-alpine3.21-jdk
+Tags: 26-alpine3.21, 26.0.2-alpine3.21, 26-alpine3.21-full, 26-alpine3.21-jdk
 Architectures: amd64, arm64v8
 Directory: 26/jdk/alpine/3.21
 
-Tags: 26-alpine3.22, 26.0.1-alpine3.22, 26-alpine3.22-full, 26-alpine3.22-jdk
+Tags: 26-alpine3.22, 26.0.2-alpine3.22, 26-alpine3.22-full, 26-alpine3.22-jdk
 Architectures: amd64, arm64v8
 Directory: 26/jdk/alpine/3.22
 
-Tags: 26-alpine3.23, 26.0.1-alpine3.23, 26-alpine3.23-full, 26-alpine3.23-jdk
+Tags: 26-alpine3.23, 26.0.2-alpine3.23, 26-alpine3.23-full, 26-alpine3.23-jdk
 Architectures: amd64, arm64v8
 Directory: 26/jdk/alpine/3.23
 
-Tags: 26-alpine3.24, 26.0.1-alpine3.24, 26-alpine3.24-full, 26-alpine3.24-jdk, 26-alpine, 26.0.1-alpine, 26-alpine-full, 26-alpine-jdk
+Tags: 26-alpine3.24, 26.0.2-alpine3.24, 26-alpine3.24-full, 26-alpine3.24-jdk, 26-alpine, 26.0.2-alpine, 26-alpine-full, 26-alpine-jdk
 Architectures: amd64, arm64v8
 Directory: 26/jdk/alpine/3.24
diff --git a/_bashbrew-list b/_bashbrew-list
index 05dabbd..fba83b3 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,21 +1,22 @@
 amazoncorretto:8
-amazoncorretto:8u492
-amazoncorretto:8u492-al2
-amazoncorretto:8u492-al2-generic
-amazoncorretto:8u492-al2-native-jdk
-amazoncorretto:8u492-al2-native-jre
-amazoncorretto:8u492-al2023
-amazoncorretto:8u492-al2023-jre
-amazoncorretto:8u492-alpine
-amazoncorretto:8u492-alpine3.21
-amazoncorretto:8u492-alpine3.21-jre
-amazoncorretto:8u492-alpine3.22
-amazoncorretto:8u492-alpine3.22-jre
-amazoncorretto:8u492-alpine3.23
-amazoncorretto:8u492-alpine3.23-jre
-amazoncorretto:8u492-alpine3.24
-amazoncorretto:8u492-alpine3.24-jre
-amazoncorretto:8u492-alpine-jre
+amazoncorretto:8u502
+amazoncorretto:8u502-al2
+amazoncorretto:8u502-al2-generic
+amazoncorretto:8u502-al2-native-jdk
+amazoncorretto:8u502-al2-native-jre
+amazoncorretto:8u502-al2023
+amazoncorretto:8u502-al2023-jre
+amazoncorretto:8u502-alpine
+amazoncorretto:8u502-alpine3.21
+amazoncorretto:8u502-alpine3.21-jre
+amazoncorretto:8u502-alpine3.22
+amazoncorretto:8u502-alpine3.22-jre
+amazoncorretto:8u502-alpine3.23
+amazoncorretto:8u502-alpine3.23-jre
+amazoncorretto:8u502-alpine3.24
+amazoncorretto:8u502-alpine3.24-jre
+amazoncorretto:8u502-alpine-jre
+amazoncorretto:8-al2
 amazoncorretto:8-al2-full
 amazoncorretto:8-al2-generic
 amazoncorretto:8-al2-generic-jdk
@@ -45,7 +46,10 @@ amazoncorretto:8-alpine3.24-jre
 amazoncorretto:8-alpine-full
 amazoncorretto:8-alpine-jdk
 amazoncorretto:8-alpine-jre
+amazoncorretto:8-jdk
+amazoncorretto:8-jre
 amazoncorretto:11
+amazoncorretto:11-al2
 amazoncorretto:11-al2-full
 amazoncorretto:11-al2-generic
 amazoncorretto:11-al2-generic-jdk
@@ -71,20 +75,24 @@ amazoncorretto:11-alpine3.24-full
 amazoncorretto:11-alpine3.24-jdk
 amazoncorretto:11-alpine-full
 amazoncorretto:11-alpine-jdk
-amazoncorretto:11.0.31
-amazoncorretto:11.0.31-al2
-amazoncorretto:11.0.31-al2-generic
-amazoncorretto:11.0.31-al2-native-headless
-amazoncorretto:11.0.31-al2-native-jdk
-amazoncorretto:11.0.31-al2023
-amazoncorretto:11.0.31-al2023-headful
-amazoncorretto:11.0.31-al2023-headless
-amazoncorretto:11.0.31-alpine
-amazoncorretto:11.0.31-alpine3.21
-amazoncorretto:11.0.31-alpine3.22
-amazoncorretto:11.0.31-alpine3.23
-amazoncorretto:11.0.31-alpine3.24
+amazoncorretto:11-headful
+amazoncorretto:11-headless
+amazoncorretto:11-jdk
+amazoncorretto:11.0.32
+amazoncorretto:11.0.32-al2
+amazoncorretto:11.0.32-al2-generic
+amazoncorretto:11.0.32-al2-native-headless
+amazoncorretto:11.0.32-al2-native-jdk
+amazoncorretto:11.0.32-al2023
+amazoncorretto:11.0.32-al2023-headful
+amazoncorretto:11.0.32-al2023-headless
+amazoncorretto:11.0.32-alpine
+amazoncorretto:11.0.32-alpine3.21
+amazoncorretto:11.0.32-alpine3.22
+amazoncorretto:11.0.32-alpine3.23
+amazoncorretto:11.0.32-alpine3.24
 amazoncorretto:17
+amazoncorretto:17-al2
 amazoncorretto:17-al2-full
 amazoncorretto:17-al2-generic
 amazoncorretto:17-al2-generic-jdk
@@ -111,21 +119,25 @@ amazoncorretto:17-alpine3.24-full
 amazoncorretto:17-alpine3.24-jdk
 amazoncorretto:17-alpine-full
 amazoncorretto:17-alpine-jdk
-amazoncorretto:17.0.19
-amazoncorretto:17.0.19-al2
-amazoncorretto:17.0.19-al2-generic
-amazoncorretto:17.0.19-al2-native-headful
-amazoncorretto:17.0.19-al2-native-headless
-amazoncorretto:17.0.19-al2-native-jdk
-amazoncorretto:17.0.19-al2023
-amazoncorretto:17.0.19-al2023-headful
-amazoncorretto:17.0.19-al2023-headless
-amazoncorretto:17.0.19-alpine
-amazoncorretto:17.0.19-alpine3.21
-amazoncorretto:17.0.19-alpine3.22
-amazoncorretto:17.0.19-alpine3.23
-amazoncorretto:17.0.19-alpine3.24
+amazoncorretto:17-headful
+amazoncorretto:17-headless
+amazoncorretto:17-jdk
+amazoncorretto:17.0.20
+amazoncorretto:17.0.20-al2
+amazoncorretto:17.0.20-al2-generic
+amazoncorretto:17.0.20-al2-native-headful
+amazoncorretto:17.0.20-al2-native-headless
+amazoncorretto:17.0.20-al2-native-jdk
+amazoncorretto:17.0.20-al2023
+amazoncorretto:17.0.20-al2023-headful
+amazoncorretto:17.0.20-al2023-headless
+amazoncorretto:17.0.20-alpine
+amazoncorretto:17.0.20-alpine3.21
+amazoncorretto:17.0.20-alpine3.22
+amazoncorretto:17.0.20-alpine3.23
+amazoncorretto:17.0.20-alpine3.24
 amazoncorretto:21
+amazoncorretto:21-al2
 amazoncorretto:21-al2-full
 amazoncorretto:21-al2-generic
 amazoncorretto:21-al2-generic-jdk
@@ -149,17 +161,20 @@ amazoncorretto:21-alpine3.24-full
 amazoncorretto:21-alpine3.24-jdk
 amazoncorretto:21-alpine-full
 amazoncorretto:21-alpine-jdk
-amazoncorretto:21.0.11
-amazoncorretto:21.0.11-al2
-amazoncorretto:21.0.11-al2-generic
-amazoncorretto:21.0.11-al2023
-amazoncorretto:21.0.11-al2023-headful
-amazoncorretto:21.0.11-al2023-headless
-amazoncorretto:21.0.11-alpine
-amazoncorretto:21.0.11-alpine3.21
-amazoncorretto:21.0.11-alpine3.22
-amazoncorretto:21.0.11-alpine3.23
-amazoncorretto:21.0.11-alpine3.24
+amazoncorretto:21-headful
+amazoncorretto:21-headless
+amazoncorretto:21-jdk
+amazoncorretto:21.0.12
+amazoncorretto:21.0.12-al2
+amazoncorretto:21.0.12-al2-generic
+amazoncorretto:21.0.12-al2023
+amazoncorretto:21.0.12-al2023-headful
+amazoncorretto:21.0.12-al2023-headless
+amazoncorretto:21.0.12-alpine
+amazoncorretto:21.0.12-alpine3.21
+amazoncorretto:21.0.12-alpine3.22
+amazoncorretto:21.0.12-alpine3.23
+amazoncorretto:21.0.12-alpine3.24
 amazoncorretto:25
 amazoncorretto:25-al2023
 amazoncorretto:25-al2023-headful
@@ -183,15 +198,15 @@ amazoncorretto:25-alpine-jdk
 amazoncorretto:25-headful
 amazoncorretto:25-headless
 amazoncorretto:25-jdk
-amazoncorretto:25.0.3
-amazoncorretto:25.0.3-al2023
-amazoncorretto:25.0.3-al2023-headful
-amazoncorretto:25.0.3-al2023-headless
-amazoncorretto:25.0.3-alpine
-amazoncorretto:25.0.3-alpine3.21
-amazoncorretto:25.0.3-alpine3.22
-amazoncorretto:25.0.3-alpine3.23
-amazoncorretto:25.0.3-alpine3.24
+amazoncorretto:25.0.4
+amazoncorretto:25.0.4-al2023
+amazoncorretto:25.0.4-al2023-headful
+amazoncorretto:25.0.4-al2023-headless
+amazoncorretto:25.0.4-alpine
+amazoncorretto:25.0.4-alpine3.21
+amazoncorretto:25.0.4-alpine3.22
+amazoncorretto:25.0.4-alpine3.23
+amazoncorretto:25.0.4-alpine3.24
 amazoncorretto:26
 amazoncorretto:26-al2023
 amazoncorretto:26-al2023-headful
@@ -215,13 +230,13 @@ amazoncorretto:26-alpine-jdk
 amazoncorretto:26-headful
 amazoncorretto:26-headless
 amazoncorretto:26-jdk
-amazoncorretto:26.0.1
-amazoncorretto:26.0.1-al2023
-amazoncorretto:26.0.1-al2023-headful
-amazoncorretto:26.0.1-al2023-headless
-amazoncorretto:26.0.1-alpine
-amazoncorretto:26.0.1-alpine3.21
-amazoncorretto:26.0.1-alpine3.22
-amazoncorretto:26.0.1-alpine3.23
-amazoncorretto:26.0.1-alpine3.24
+amazoncorretto:26.0.2
+amazoncorretto:26.0.2-al2023
+amazoncorretto:26.0.2-al2023-headful
+amazoncorretto:26.0.2-al2023-headless
+amazoncorretto:26.0.2-alpine
+amazoncorretto:26.0.2-alpine3.21
+amazoncorretto:26.0.2-alpine3.22
+amazoncorretto:26.0.2-alpine3.23
+amazoncorretto:26.0.2-alpine3.24
 amazoncorretto:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 899bab7..30011f6 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,55 +1,56 @@
-amazoncorretto:8u492-al2-native-jdk
-amazoncorretto:8u492-al2-native-jre
-amazoncorretto:8u492-al2023-jre
-amazoncorretto:8u492-alpine3.21-jre
-amazoncorretto:8u492-alpine3.22-jre
-amazoncorretto:8u492-alpine3.23-jre
-amazoncorretto:8u492-alpine-jre
+amazoncorretto:8u502-al2-native-jdk
+amazoncorretto:8u502-al2-native-jre
+amazoncorretto:8u502-alpine3.21-jre
+amazoncorretto:8u502-alpine3.22-jre
+amazoncorretto:8u502-alpine3.23-jre
+amazoncorretto:8u502-alpine-jre
+amazoncorretto:8-al2-generic-jdk
 amazoncorretto:8-alpine3.21-jdk
 amazoncorretto:8-alpine3.22-jdk
 amazoncorretto:8-alpine3.23-jdk
 amazoncorretto:8-alpine-jdk
+amazoncorretto:8-jre
 amazoncorretto:11-al2-generic-jdk
-amazoncorretto:11-al2023-jdk
 amazoncorretto:11-alpine3.21-jdk
 amazoncorretto:11-alpine3.22-jdk
 amazoncorretto:11-alpine3.23-jdk
 amazoncorretto:11-alpine-jdk
-amazoncorretto:11.0.31-al2-native-headless
-amazoncorretto:11.0.31-al2-native-jdk
-amazoncorretto:11.0.31-al2023-headful
-amazoncorretto:11.0.31-al2023-headless
+amazoncorretto:11-headful
+amazoncorretto:11-headless
+amazoncorretto:11.0.32
+amazoncorretto:11.0.32-al2-native-headless
+amazoncorretto:11.0.32-al2-native-jdk
 amazoncorretto:17-al2-generic-jdk
-amazoncorretto:17-al2023-jdk
 amazoncorretto:17-alpine3.21-jdk
 amazoncorretto:17-alpine3.22-jdk
 amazoncorretto:17-alpine3.23-jdk
 amazoncorretto:17-alpine-jdk
-amazoncorretto:17.0.19-al2-native-headful
-amazoncorretto:17.0.19-al2-native-headless
-amazoncorretto:17.0.19-al2-native-jdk
-amazoncorretto:17.0.19-al2023-headful
-amazoncorretto:17.0.19-al2023-headless
+amazoncorretto:17-headful
+amazoncorretto:17-headless
+amazoncorretto:17.0.20
+amazoncorretto:17.0.20-al2-native-headful
+amazoncorretto:17.0.20-al2-native-headless
+amazoncorretto:17.0.20-al2-native-jdk
 amazoncorretto:21-al2-generic-jdk
-amazoncorretto:21-al2023-jdk
 amazoncorretto:21-alpine3.21-jdk
 amazoncorretto:21-alpine3.22-jdk
 amazoncorretto:21-alpine3.23-jdk
 amazoncorretto:21-alpine-jdk
-amazoncorretto:21.0.11-al2023-headful
-amazoncorretto:21.0.11-al2023-headless
+amazoncorretto:21-headful
+amazoncorretto:21-headless
+amazoncorretto:21.0.12
 amazoncorretto:25-alpine3.21-jdk
 amazoncorretto:25-alpine3.22-jdk
 amazoncorretto:25-alpine3.23-jdk
 amazoncorretto:25-alpine-jdk
 amazoncorretto:25-headful
 amazoncorretto:25-headless
-amazoncorretto:25.0.3
+amazoncorretto:25.0.4
 amazoncorretto:26-alpine3.21-jdk
 amazoncorretto:26-alpine3.22-jdk
 amazoncorretto:26-alpine3.23-jdk
 amazoncorretto:26-alpine-jdk
 amazoncorretto:26-headful
 amazoncorretto:26-headless
-amazoncorretto:26.0.1
+amazoncorretto:26.0.2
 amazoncorretto:latest
diff --git a/amazoncorretto_11-al2-generic-jdk/Dockerfile b/amazoncorretto_11-al2-generic-jdk/Dockerfile
index 6fa3f85..4471bf0 100644
--- a/amazoncorretto_11-al2-generic-jdk/Dockerfile
+++ b/amazoncorretto_11-al2-generic-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2
 
-ARG version=11.0.31.11-1
+ARG version=11.0.32.9-1
 # In addition to installing the Amazon corretto, we also install
 # fontconfig. The folks who manage the docker hub's
 # official image library have found that font management
diff --git a/amazoncorretto_11-alpine-jdk/Dockerfile b/amazoncorretto_11-alpine-jdk/Dockerfile
index 2e4714f..4a190c7 100644
--- a/amazoncorretto_11-alpine-jdk/Dockerfile
+++ b/amazoncorretto_11-alpine-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.24
 
-ARG version=11.0.31.11.1
+ARG version=11.0.32.9.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_11-alpine3.21-jdk/Dockerfile b/amazoncorretto_11-alpine3.21-jdk/Dockerfile
index ea2c322..9f8cce8 100644
--- a/amazoncorretto_11-alpine3.21-jdk/Dockerfile
+++ b/amazoncorretto_11-alpine3.21-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.21
 
-ARG version=11.0.31.11.1
+ARG version=11.0.32.9.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_11-alpine3.22-jdk/Dockerfile b/amazoncorretto_11-alpine3.22-jdk/Dockerfile
index ad43c37..a541a78 100644
--- a/amazoncorretto_11-alpine3.22-jdk/Dockerfile
+++ b/amazoncorretto_11-alpine3.22-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.22
 
-ARG version=11.0.31.11.1
+ARG version=11.0.32.9.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_11-alpine3.23-jdk/Dockerfile b/amazoncorretto_11-alpine3.23-jdk/Dockerfile
index 040a097..c700c09 100644
--- a/amazoncorretto_11-alpine3.23-jdk/Dockerfile
+++ b/amazoncorretto_11-alpine3.23-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.23
 
-ARG version=11.0.31.11.1
+ARG version=11.0.32.9.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_11.0.31-al2023-headful/Dockerfile b/amazoncorretto_11-headful/Dockerfile
similarity index 97%
rename from amazoncorretto_11.0.31-al2023-headful/Dockerfile
rename to amazoncorretto_11-headful/Dockerfile
index 6d82880..866c907 100644
--- a/amazoncorretto_11.0.31-al2023-headful/Dockerfile
+++ b/amazoncorretto_11-headful/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=11.0.31.11-1
+ARG version=11.0.32.9-1
 RUN set -eux \
     && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
diff --git a/amazoncorretto_11.0.31-al2023-headless/Dockerfile b/amazoncorretto_11-headless/Dockerfile
similarity index 97%
rename from amazoncorretto_11.0.31-al2023-headless/Dockerfile
rename to amazoncorretto_11-headless/Dockerfile
index 3451620..90c4905 100644
--- a/amazoncorretto_11.0.31-al2023-headless/Dockerfile
+++ b/amazoncorretto_11-headless/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=11.0.31.11-1
+ARG version=11.0.32.9-1
 RUN set -eux \
     && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
diff --git a/amazoncorretto_11.0.31-al2-native-headless/Dockerfile b/amazoncorretto_11.0.32-al2-native-headless/Dockerfile
similarity index 97%
rename from amazoncorretto_11.0.31-al2-native-headless/Dockerfile
rename to amazoncorretto_11.0.32-al2-native-headless/Dockerfile
index 8f67f8d..d44c0f6 100644
--- a/amazoncorretto_11.0.31-al2-native-headless/Dockerfile
+++ b/amazoncorretto_11.0.32-al2-native-headless/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2
 
-ARG version=11.0.31.11-1
+ARG version=11.0.32.9-1
 
 RUN set -eux \
     && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
diff --git a/amazoncorretto_11.0.31-al2-native-jdk/Dockerfile b/amazoncorretto_11.0.32-al2-native-jdk/Dockerfile
similarity index 98%
rename from amazoncorretto_11.0.31-al2-native-jdk/Dockerfile
rename to amazoncorretto_11.0.32-al2-native-jdk/Dockerfile
index daadc97..59a7741 100644
--- a/amazoncorretto_11.0.31-al2-native-jdk/Dockerfile
+++ b/amazoncorretto_11.0.32-al2-native-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2
 
-ARG version=11.0.31.11-1
+ARG version=11.0.32.9-1
 
 RUN set -eux \
     && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
diff --git a/amazoncorretto_11-al2023-jdk/Dockerfile b/amazoncorretto_11.0.32/Dockerfile
similarity index 97%
rename from amazoncorretto_11-al2023-jdk/Dockerfile
rename to amazoncorretto_11.0.32/Dockerfile
index d663f9d..aa75614 100644
--- a/amazoncorretto_11-al2023-jdk/Dockerfile
+++ b/amazoncorretto_11.0.32/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=11.0.31.11-1
+ARG version=11.0.32.9-1
 
 RUN set -eux \
     && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
diff --git a/amazoncorretto_17-al2-generic-jdk/Dockerfile b/amazoncorretto_17-al2-generic-jdk/Dockerfile
index de58c41..ee9c413 100644
--- a/amazoncorretto_17-al2-generic-jdk/Dockerfile
+++ b/amazoncorretto_17-al2-generic-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2
 
-ARG version=17.0.19.10-1
+ARG version=17.0.20.8-1
 # In addition to installing the Amazon corretto, we also install
 # fontconfig. The folks who manage the docker hub's
 # official image library have found that font management
diff --git a/amazoncorretto_17-alpine-jdk/Dockerfile b/amazoncorretto_17-alpine-jdk/Dockerfile
index c5e064f..fda8c97 100644
--- a/amazoncorretto_17-alpine-jdk/Dockerfile
+++ b/amazoncorretto_17-alpine-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.24
 
-ARG version=17.0.19.10.1
+ARG version=17.0.20.8.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_17-alpine3.21-jdk/Dockerfile b/amazoncorretto_17-alpine3.21-jdk/Dockerfile
index 78015b0..23f8606 100644
--- a/amazoncorretto_17-alpine3.21-jdk/Dockerfile
+++ b/amazoncorretto_17-alpine3.21-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.21
 
-ARG version=17.0.19.10.1
+ARG version=17.0.20.8.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_17-alpine3.22-jdk/Dockerfile b/amazoncorretto_17-alpine3.22-jdk/Dockerfile
index 55e0030..13533a5 100644
--- a/amazoncorretto_17-alpine3.22-jdk/Dockerfile
+++ b/amazoncorretto_17-alpine3.22-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.22
 
-ARG version=17.0.19.10.1
+ARG version=17.0.20.8.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_17-alpine3.23-jdk/Dockerfile b/amazoncorretto_17-alpine3.23-jdk/Dockerfile
index fb89eb6..681e828 100644
--- a/amazoncorretto_17-alpine3.23-jdk/Dockerfile
+++ b/amazoncorretto_17-alpine3.23-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.23
 
-ARG version=17.0.19.10.1
+ARG version=17.0.20.8.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_17.0.19-al2023-headful/Dockerfile b/amazoncorretto_17-headful/Dockerfile
similarity index 97%
rename from amazoncorretto_17.0.19-al2023-headful/Dockerfile
rename to amazoncorretto_17-headful/Dockerfile
index 88462a5..faf8465 100644
--- a/amazoncorretto_17.0.19-al2023-headful/Dockerfile
+++ b/amazoncorretto_17-headful/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=17.0.19.10-1
+ARG version=17.0.20.8-1
 ARG package_version=1
 
 RUN set -eux \
diff --git a/amazoncorretto_17.0.19-al2023-headless/Dockerfile b/amazoncorretto_17-headless/Dockerfile
similarity index 97%
rename from amazoncorretto_17.0.19-al2023-headless/Dockerfile
rename to amazoncorretto_17-headless/Dockerfile
index a50abcf..c5b89f0 100644
--- a/amazoncorretto_17.0.19-al2023-headless/Dockerfile
+++ b/amazoncorretto_17-headless/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=17.0.19.10-1
+ARG version=17.0.20.8-1
 ARG package_version=1
 
 RUN set -eux \
diff --git a/amazoncorretto_17.0.19-al2-native-headful/Dockerfile b/amazoncorretto_17.0.20-al2-native-headful/Dockerfile
similarity index 98%
rename from amazoncorretto_17.0.19-al2-native-headful/Dockerfile
rename to amazoncorretto_17.0.20-al2-native-headful/Dockerfile
index 42a77c5..2bd1452 100644
--- a/amazoncorretto_17.0.19-al2-native-headful/Dockerfile
+++ b/amazoncorretto_17.0.20-al2-native-headful/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2
 
-ARG version=17.0.19.10-1
+ARG version=17.0.20.8-1
 
 RUN set -eux \
     && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
diff --git a/amazoncorretto_17.0.19-al2-native-headless/Dockerfile b/amazoncorretto_17.0.20-al2-native-headless/Dockerfile
similarity index 97%
rename from amazoncorretto_17.0.19-al2-native-headless/Dockerfile
rename to amazoncorretto_17.0.20-al2-native-headless/Dockerfile
index 7a291bf..3e23a04 100644
--- a/amazoncorretto_17.0.19-al2-native-headless/Dockerfile
+++ b/amazoncorretto_17.0.20-al2-native-headless/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2
 
-ARG version=17.0.19.10-1
+ARG version=17.0.20.8-1
 
 RUN set -eux \
     && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
diff --git a/amazoncorretto_17.0.19-al2-native-jdk/Dockerfile b/amazoncorretto_17.0.20-al2-native-jdk/Dockerfile
similarity index 98%
rename from amazoncorretto_17.0.19-al2-native-jdk/Dockerfile
rename to amazoncorretto_17.0.20-al2-native-jdk/Dockerfile
index 8193bc5..62520bd 100644
--- a/amazoncorretto_17.0.19-al2-native-jdk/Dockerfile
+++ b/amazoncorretto_17.0.20-al2-native-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2
 
-ARG version=17.0.19.10-1
+ARG version=17.0.20.8-1
 
 RUN set -eux \
     && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
diff --git a/amazoncorretto_17-al2023-jdk/Dockerfile b/amazoncorretto_17.0.20/Dockerfile
similarity index 98%
rename from amazoncorretto_17-al2023-jdk/Dockerfile
rename to amazoncorretto_17.0.20/Dockerfile
index ab454c7..adf97ed 100644
--- a/amazoncorretto_17-al2023-jdk/Dockerfile
+++ b/amazoncorretto_17.0.20/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=17.0.19.10-1
+ARG version=17.0.20.8-1
 ARG package_version=1
 
 RUN set -eux \
diff --git a/amazoncorretto_21-al2-generic-jdk/Dockerfile b/amazoncorretto_21-al2-generic-jdk/Dockerfile
index ea6ade5..1f30362 100644
--- a/amazoncorretto_21-al2-generic-jdk/Dockerfile
+++ b/amazoncorretto_21-al2-generic-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2
 
-ARG version=21.0.11.10-1
+ARG version=21.0.12.8-1
 # In addition to installing the Amazon corretto, we also install
 # fontconfig. The folks who manage the docker hub's
 # official image library have found that font management
diff --git a/amazoncorretto_21-alpine-jdk/Dockerfile b/amazoncorretto_21-alpine-jdk/Dockerfile
index a043307..bf8606f 100644
--- a/amazoncorretto_21-alpine-jdk/Dockerfile
+++ b/amazoncorretto_21-alpine-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.24
 
-ARG version=21.0.11.10.1
+ARG version=21.0.12.8.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_21-alpine3.21-jdk/Dockerfile b/amazoncorretto_21-alpine3.21-jdk/Dockerfile
index db3c99e..8c6d7fc 100644
--- a/amazoncorretto_21-alpine3.21-jdk/Dockerfile
+++ b/amazoncorretto_21-alpine3.21-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.21
 
-ARG version=21.0.11.10.1
+ARG version=21.0.12.8.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_21-alpine3.22-jdk/Dockerfile b/amazoncorretto_21-alpine3.22-jdk/Dockerfile
index 56f6eb2..d81d5e9 100644
--- a/amazoncorretto_21-alpine3.22-jdk/Dockerfile
+++ b/amazoncorretto_21-alpine3.22-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.22
 
-ARG version=21.0.11.10.1
+ARG version=21.0.12.8.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_21-alpine3.23-jdk/Dockerfile b/amazoncorretto_21-alpine3.23-jdk/Dockerfile
index ce5d4e7..48057a3 100644
--- a/amazoncorretto_21-alpine3.23-jdk/Dockerfile
+++ b/amazoncorretto_21-alpine3.23-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.23
 
-ARG version=21.0.11.10.1
+ARG version=21.0.12.8.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_21.0.11-al2023-headful/Dockerfile b/amazoncorretto_21-headful/Dockerfile
similarity index 97%
rename from amazoncorretto_21.0.11-al2023-headful/Dockerfile
rename to amazoncorretto_21-headful/Dockerfile
index 7004a44..61fbb82 100644
--- a/amazoncorretto_21.0.11-al2023-headful/Dockerfile
+++ b/amazoncorretto_21-headful/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=21.0.11.10-1
+ARG version=21.0.12.8-1
 ARG package_version=1
 
 RUN set -eux \
diff --git a/amazoncorretto_21.0.11-al2023-headless/Dockerfile b/amazoncorretto_21-headless/Dockerfile
similarity index 97%
rename from amazoncorretto_21.0.11-al2023-headless/Dockerfile
rename to amazoncorretto_21-headless/Dockerfile
index 514ffbe..25786e1 100644
--- a/amazoncorretto_21.0.11-al2023-headless/Dockerfile
+++ b/amazoncorretto_21-headless/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=21.0.11.10-1
+ARG version=21.0.12.8-1
 ARG package_version=1
 
 RUN set -eux \
diff --git a/amazoncorretto_21-al2023-jdk/Dockerfile b/amazoncorretto_21.0.12/Dockerfile
similarity index 98%
rename from amazoncorretto_21-al2023-jdk/Dockerfile
rename to amazoncorretto_21.0.12/Dockerfile
index 99b1c21..5d00328 100644
--- a/amazoncorretto_21-al2023-jdk/Dockerfile
+++ b/amazoncorretto_21.0.12/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=21.0.11.10-1
+ARG version=21.0.12.8-1
 ARG package_version=1
 
 RUN set -eux \
diff --git a/amazoncorretto_25-alpine-jdk/Dockerfile b/amazoncorretto_25-alpine-jdk/Dockerfile
index 395a322..3a6d111 100644
--- a/amazoncorretto_25-alpine-jdk/Dockerfile
+++ b/amazoncorretto_25-alpine-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.24
 
-ARG version=25.0.3.9.1
+ARG version=25.0.4.7.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_25-alpine3.21-jdk/Dockerfile b/amazoncorretto_25-alpine3.21-jdk/Dockerfile
index d9c772d..616fd51 100644
--- a/amazoncorretto_25-alpine3.21-jdk/Dockerfile
+++ b/amazoncorretto_25-alpine3.21-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.21
 
-ARG version=25.0.3.9.1
+ARG version=25.0.4.7.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_25-alpine3.22-jdk/Dockerfile b/amazoncorretto_25-alpine3.22-jdk/Dockerfile
index a4af325..5cf174c 100644
--- a/amazoncorretto_25-alpine3.22-jdk/Dockerfile
+++ b/amazoncorretto_25-alpine3.22-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.22
 
-ARG version=25.0.3.9.1
+ARG version=25.0.4.7.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_25-alpine3.23-jdk/Dockerfile b/amazoncorretto_25-alpine3.23-jdk/Dockerfile
index f495c53..55cc2a7 100644
--- a/amazoncorretto_25-alpine3.23-jdk/Dockerfile
+++ b/amazoncorretto_25-alpine3.23-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.23
 
-ARG version=25.0.3.9.1
+ARG version=25.0.4.7.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_25-headful/Dockerfile b/amazoncorretto_25-headful/Dockerfile
index 84248f7..ecba337 100644
--- a/amazoncorretto_25-headful/Dockerfile
+++ b/amazoncorretto_25-headful/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=25.0.3.9-1
+ARG version=25.0.4.7-1
 ARG package_version=1
 
 RUN set -eux \
diff --git a/amazoncorretto_25-headless/Dockerfile b/amazoncorretto_25-headless/Dockerfile
index 2f7e528..ca9c7eb 100644
--- a/amazoncorretto_25-headless/Dockerfile
+++ b/amazoncorretto_25-headless/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=25.0.3.9-1
+ARG version=25.0.4.7-1
 ARG package_version=1
 
 RUN set -eux \
diff --git a/amazoncorretto_25.0.3/Dockerfile b/amazoncorretto_25.0.4/Dockerfile
similarity index 98%
rename from amazoncorretto_25.0.3/Dockerfile
rename to amazoncorretto_25.0.4/Dockerfile
index fc2bd00..2950e5f 100644
--- a/amazoncorretto_25.0.3/Dockerfile
+++ b/amazoncorretto_25.0.4/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=25.0.3.9-1
+ARG version=25.0.4.7-1
 ARG package_version=1
 
 RUN set -eux \
diff --git a/amazoncorretto_26-alpine-jdk/Dockerfile b/amazoncorretto_26-alpine-jdk/Dockerfile
index 3aa07cd..5388bcc 100644
--- a/amazoncorretto_26-alpine-jdk/Dockerfile
+++ b/amazoncorretto_26-alpine-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.24
 
-ARG version=26.0.1.8.1
+ARG version=26.0.2.10.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_26-alpine3.21-jdk/Dockerfile b/amazoncorretto_26-alpine3.21-jdk/Dockerfile
index 15942c6..766de4e 100644
--- a/amazoncorretto_26-alpine3.21-jdk/Dockerfile
+++ b/amazoncorretto_26-alpine3.21-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.21
 
-ARG version=26.0.1.8.1
+ARG version=26.0.2.10.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_26-alpine3.22-jdk/Dockerfile b/amazoncorretto_26-alpine3.22-jdk/Dockerfile
index 3256c6f..0f2a0d7 100644
--- a/amazoncorretto_26-alpine3.22-jdk/Dockerfile
+++ b/amazoncorretto_26-alpine3.22-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.22
 
-ARG version=26.0.1.8.1
+ARG version=26.0.2.10.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_26-alpine3.23-jdk/Dockerfile b/amazoncorretto_26-alpine3.23-jdk/Dockerfile
index 3c9c094..fcdb215 100644
--- a/amazoncorretto_26-alpine3.23-jdk/Dockerfile
+++ b/amazoncorretto_26-alpine3.23-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.23
 
-ARG version=26.0.1.8.1
+ARG version=26.0.2.10.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_26-headful/Dockerfile b/amazoncorretto_26-headful/Dockerfile
index 34e93ac..c53ffc6 100644
--- a/amazoncorretto_26-headful/Dockerfile
+++ b/amazoncorretto_26-headful/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=26.0.1.8-1
+ARG version=26.0.2.10-1
 ARG package_version=1
 
 RUN set -eux \
diff --git a/amazoncorretto_26-headless/Dockerfile b/amazoncorretto_26-headless/Dockerfile
index ab9848d..4668107 100644
--- a/amazoncorretto_26-headless/Dockerfile
+++ b/amazoncorretto_26-headless/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=26.0.1.8-1
+ARG version=26.0.2.10-1
 ARG package_version=1
 
 RUN set -eux \
diff --git a/amazoncorretto_26.0.1/Dockerfile b/amazoncorretto_26.0.2/Dockerfile
similarity index 98%
rename from amazoncorretto_26.0.1/Dockerfile
rename to amazoncorretto_26.0.2/Dockerfile
index 09f2270..044756d 100644
--- a/amazoncorretto_26.0.1/Dockerfile
+++ b/amazoncorretto_26.0.2/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=26.0.1.8-1
+ARG version=26.0.2.10-1
 ARG package_version=1
 
 RUN set -eux \
diff --git a/amazoncorretto_latest/Dockerfile b/amazoncorretto_8-al2-generic-jdk/Dockerfile
similarity index 98%
copy from amazoncorretto_latest/Dockerfile
copy to amazoncorretto_8-al2-generic-jdk/Dockerfile
index 230e37e..1624105 100644
--- a/amazoncorretto_latest/Dockerfile
+++ b/amazoncorretto_8-al2-generic-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2
 
-ARG version=1.8.0_492.b09-2
+ARG version=1.8.0_502.b07-1
 # In addition to installing the Amazon corretto, we also install
 # fontconfig. The folks who manage the docker hub's
 # official image library have found that font management
diff --git a/amazoncorretto_8-alpine-jdk/Dockerfile b/amazoncorretto_8-alpine-jdk/Dockerfile
index 71b8d59..6d57891 100644
--- a/amazoncorretto_8-alpine-jdk/Dockerfile
+++ b/amazoncorretto_8-alpine-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.24
 
-ARG version=8.492.09.2
+ARG version=8.502.07.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_8-alpine3.21-jdk/Dockerfile b/amazoncorretto_8-alpine3.21-jdk/Dockerfile
index de38f4d..8ba3121 100644
--- a/amazoncorretto_8-alpine3.21-jdk/Dockerfile
+++ b/amazoncorretto_8-alpine3.21-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.21
 
-ARG version=8.492.09.2
+ARG version=8.502.07.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_8-alpine3.22-jdk/Dockerfile b/amazoncorretto_8-alpine3.22-jdk/Dockerfile
index 45d0cdb..b4f5c49 100644
--- a/amazoncorretto_8-alpine3.22-jdk/Dockerfile
+++ b/amazoncorretto_8-alpine3.22-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.22
 
-ARG version=8.492.09.2
+ARG version=8.502.07.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_8-alpine3.23-jdk/Dockerfile b/amazoncorretto_8-alpine3.23-jdk/Dockerfile
index fdbb4b6..43cf8ea 100644
--- a/amazoncorretto_8-alpine3.23-jdk/Dockerfile
+++ b/amazoncorretto_8-alpine3.23-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.23
 
-ARG version=8.492.09.2
+ARG version=8.502.07.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_8u492-al2023-jre/Dockerfile b/amazoncorretto_8-jre/Dockerfile
similarity index 79%
rename from amazoncorretto_8u492-al2023-jre/Dockerfile
rename to amazoncorretto_8-jre/Dockerfile
index 57f0fc3..844b507 100644
--- a/amazoncorretto_8u492-al2023-jre/Dockerfile
+++ b/amazoncorretto_8-jre/Dockerfile
@@ -1,7 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=1.8.0_492.b09-2
-
+ARG version=1.8.0_502.b07-1
 
 RUN set -eux \
     && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
@@ -10,18 +9,18 @@ RUN set -eux \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-1.8.0-amazon-corretto-$version.amzn2023.${ARCH}.rpm" "java-1.8.0-amazon-corretto-devel-$version.amzn2023.${ARCH}.rpm") \
+    && RPM_LIST=("java-1.8.0-amazon-corretto-$version.amzn2023.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/${resouce_version}/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
+    && alternatives --install /usr/lib/jvm/java-1.8.0-amazon-corretto java-1.8.0-amazon-corretto /usr/lib/jvm/java-1.8.0-amazon-corretto.${ARCH} 100 \
     && popd \
     && rm -rf /usr/lib/jvm/java-1.8.0-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
-    && rm -rf /var/cache/yum \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
 
 ENV LANG=C.UTF-8
-ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto
+ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto/jre
diff --git a/amazoncorretto_8u492-al2-native-jdk/Dockerfile b/amazoncorretto_8u502-al2-native-jdk/Dockerfile
similarity index 95%
rename from amazoncorretto_8u492-al2-native-jdk/Dockerfile
rename to amazoncorretto_8u502-al2-native-jdk/Dockerfile
index 3790e92..a141d73 100644
--- a/amazoncorretto_8u492-al2-native-jdk/Dockerfile
+++ b/amazoncorretto_8u502-al2-native-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2
 
-ARG version=1.8.0_492.b09-2
+ARG version=1.8.0_502.b07-1
 
 
 RUN set -eux \
@@ -16,6 +16,7 @@ RUN set -eux \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: rsa sha1 (md5) pgp md5 OK" || exit 1 \
     && yum install -y $(yum deplist "${CORRETO_TEMP}/${rpm}" |grep provider | grep -v log4j-cve | tr -s ' ' |cut -d ' ' -f 3 ); \
     done \
+    && yum install -y fontconfig \
     && rpm -i --nodeps ${CORRETO_TEMP}/*.rpm \
     && popd \
     && (find /usr/lib/jvm/java-1.8.0-amazon-corretto.${ARCH} -name "*src.zip" -delete || true) \
diff --git a/amazoncorretto_8u492-al2-native-jre/Dockerfile b/amazoncorretto_8u502-al2-native-jre/Dockerfile
similarity index 95%
rename from amazoncorretto_8u492-al2-native-jre/Dockerfile
rename to amazoncorretto_8u502-al2-native-jre/Dockerfile
index fd277c4..3a63401 100644
--- a/amazoncorretto_8u492-al2-native-jre/Dockerfile
+++ b/amazoncorretto_8u502-al2-native-jre/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2
 
-ARG version=1.8.0_492.b09-2
+ARG version=1.8.0_502.b07-1
 
 
 RUN set -eux \
@@ -17,6 +17,7 @@ RUN set -eux \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: rsa sha1 (md5) pgp md5 OK" || exit 1; \
     done \
     && yum install -y $(yum deplist ${CORRETO_TEMP}/*.rpm |grep provider | grep -v log4j-cve | tr -s ' ' |cut -d ' ' -f 3 ) \
+    && yum install -y fontconfig \
     && rpm -i --nodeps ${CORRETO_TEMP}/*.rpm \
     && popd \
     && rm -rf /usr/lib/jvm/java-1.8.0-amazon-corretto.${ARCH}/lib/src.zip \
diff --git a/amazoncorretto_8u492-alpine-jre/Dockerfile b/amazoncorretto_8u502-alpine-jre/Dockerfile
similarity index 97%
rename from amazoncorretto_8u492-alpine-jre/Dockerfile
rename to amazoncorretto_8u502-alpine-jre/Dockerfile
index 64c0d10..10dd80b 100644
--- a/amazoncorretto_8u492-alpine-jre/Dockerfile
+++ b/amazoncorretto_8u502-alpine-jre/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.24
 
-ARG version=8.492.09.2
+ARG version=8.502.07.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_8u492-alpine3.21-jre/Dockerfile b/amazoncorretto_8u502-alpine3.21-jre/Dockerfile
similarity index 97%
rename from amazoncorretto_8u492-alpine3.21-jre/Dockerfile
rename to amazoncorretto_8u502-alpine3.21-jre/Dockerfile
index 566a9fe..ae417b7 100644
--- a/amazoncorretto_8u492-alpine3.21-jre/Dockerfile
+++ b/amazoncorretto_8u502-alpine3.21-jre/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.21
 
-ARG version=8.492.09.2
+ARG version=8.502.07.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_8u492-alpine3.22-jre/Dockerfile b/amazoncorretto_8u502-alpine3.22-jre/Dockerfile
similarity index 97%
rename from amazoncorretto_8u492-alpine3.22-jre/Dockerfile
rename to amazoncorretto_8u502-alpine3.22-jre/Dockerfile
index a71ae8b..add6c20 100644
--- a/amazoncorretto_8u492-alpine3.22-jre/Dockerfile
+++ b/amazoncorretto_8u502-alpine3.22-jre/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.22
 
-ARG version=8.492.09.2
+ARG version=8.502.07.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_8u492-alpine3.23-jre/Dockerfile b/amazoncorretto_8u502-alpine3.23-jre/Dockerfile
similarity index 97%
rename from amazoncorretto_8u492-alpine3.23-jre/Dockerfile
rename to amazoncorretto_8u502-alpine3.23-jre/Dockerfile
index 6e4596e..ab6aad9 100644
--- a/amazoncorretto_8u492-alpine3.23-jre/Dockerfile
+++ b/amazoncorretto_8u502-alpine3.23-jre/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.23
 
-ARG version=8.492.09.2
+ARG version=8.502.07.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
diff --git a/amazoncorretto_latest/Dockerfile b/amazoncorretto_latest/Dockerfile
index 230e37e..70748a1 100644
--- a/amazoncorretto_latest/Dockerfile
+++ b/amazoncorretto_latest/Dockerfile
@@ -1,32 +1,27 @@
-FROM amazonlinux:2
+FROM amazonlinux:2023
+
+ARG version=1.8.0_502.b07-1
 
-ARG version=1.8.0_492.b09-2
-# In addition to installing the Amazon corretto, we also install
-# fontconfig. The folks who manage the docker hub's
-# official image library have found that font management
-# is a common usecase, and painpoint, and have
-# recommended that Java images include font support.
-#
-# See:
-#  https://github.com/docker-library/official-images/blob/master/test/tests/java-uimanager-font/container.java
 
-# The logic and code related to Fingerprint is contributed by @tianon in a Github PR's Conversation
-# Comment = https://github.com/docker-library/official-images/pull/7459#issuecomment-592242757
-# PR = https://github.com/docker-library/official-images/pull/7459
 RUN set -eux \
-    && export GNUPGHOME="$(mktemp -d)" \
-    && curl -fL -o corretto.key https://yum.corretto.aws/corretto.key \
-    && gpg --batch --import corretto.key \
-    && gpg --batch --export --armor '6DC3636DAE534049C8B94623A122542AB04F24E3' > corretto.key \
-    && rpm --import corretto.key \
-    && rm -r "$GNUPGHOME" corretto.key \
-    && curl -fL -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo \
-    && grep -q '^gpgcheck=1' /etc/yum.repos.d/corretto.repo \
-    && echo "priority=9" >> /etc/yum.repos.d/corretto.repo \
-    && yum install -y java-1.8.0-amazon-corretto-devel-$version \
-    && (find /usr/lib/jvm/java-1.8.0-amazon-corretto -name src.zip -delete || true) \
-    && yum install -y fontconfig \
-    && yum clean all
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
+    && export resouce_version=$(echo $version | tr '-' '.' | tr '_' '.'| tr -d "b" | awk -F. '{print $2"."$4"."$5"."$6}') \
+    && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
+    && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
+    && CORRETO_TEMP=$(mktemp -d) \
+    && pushd ${CORRETO_TEMP} \
+    && RPM_LIST=("java-1.8.0-amazon-corretto-$version.amzn2023.${ARCH}.rpm" "java-1.8.0-amazon-corretto-devel-$version.amzn2023.${ARCH}.rpm") \
+    && for rpm in ${RPM_LIST[@]}; do \
+    curl --fail -O https://corretto.aws/downloads/resources/${resouce_version}/${rpm} \
+    && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
+    done \
+    && dnf install -y ${CORRETO_TEMP}/*.rpm \
+    && popd \
+    && rm -rf /usr/lib/jvm/java-1.8.0-amazon-corretto.${ARCH}/lib/src.zip \
+    && rm -rf ${CORRETO_TEMP} \
+    && dnf clean all \
+    && rm -rf /var/cache/yum \
+    && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
 
 ENV LANG=C.UTF-8
 ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto

Relevant Maintainers:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

library/amazoncorretto

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@mmm-choi