Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

eclipse-temurin: add Alpine 3.21 and Windows Server 2025 #18261

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

eclipse-temurin: add Alpine 3.21 and Windows Server 2025 #18261

wants to merge 4 commits into from
+274 −64

Conversation

gdams
Copy link
Contributor

@gdams gdams commented Jan 19, 2025 •
edited
Loading

No description provided.

@gdams gdams requested a review from a team as a code owner January 19, 2025 10:29
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@gdams

This comment was marked as outdated.

Sign in to view
@gdams
Copy link
Contributor Author

gdams commented Jan 20, 2025

I'll rebase once #18143 has been merged

@gdams
Copy link
Contributor Author

gdams commented Jan 21, 2025

This should be good to go now @tianon

@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
yosifkit
yosifkit reviewed Jan 21, 2025
View reviewed changes
library/eclipse-temurin Outdated Show resolved Hide resolved
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@gdams gdams mentioned this pull request Jan 22, 2025
Open
@github-actions GitHub Actions
Copy link

Diff for 38d84a5: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index bba9aa4..1a8ed8a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,18 +3,22 @@ GitRepo: https://github.com/adoptium/containers.git
 GitFetch: refs/heads/main
 Builder: buildkit
 
-Tags: 8u432-b06-jdk-alpine, 8-jdk-alpine, 8-alpine
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
-Directory: 8/jdk/alpine
+Tags: 8u432-b06-jdk-alpine-3.20, 8-jdk-alpine-3.20, 8-alpine-3.20
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 8/jdk/alpine/3.20
+
+Tags: 8u432-b06-jdk-alpine-3.21, 8-jdk-alpine-3.21, 8-alpine-3.21, 8u432-b06-jdk-alpine, 8-jdk-alpine, 8-alpine
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 8/jdk/alpine/3.21
 
 Tags: 8u432-b06-jdk-focal, 8-jdk-focal, 8-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 8/jdk/ubuntu/focal
 
 Tags: 8u432-b06-jdk-jammy, 8-jdk-jammy, 8-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 8/jdk/ubuntu/jammy
 
 Tags: 8u432-b06-jdk-nanoserver-1809, 8-jdk-nanoserver-1809, 8-nanoserver-1809
@@ -33,15 +37,23 @@ Directory: 8/jdk/windows/nanoserver-ltsc2022
 Builder: classic
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
+Tags: 8u432-b06-jdk-nanoserver-ltsc2025, 8-jdk-nanoserver-ltsc2025, 8-nanoserver-ltsc2025
+SharedTags: 8u432-b06-jdk-nanoserver, 8-jdk-nanoserver, 8-nanoserver
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 8/jdk/windows/nanoserver-ltsc2025
+Builder: classic
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 8u432-b06-jdk-noble, 8-jdk-noble, 8-noble
 SharedTags: 8u432-b06-jdk, 8-jdk, 8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 8/jdk/ubuntu/noble
 
 Tags: 8u432-b06-jdk-ubi9-minimal, 8-jdk-ubi9-minimal, 8-ubi9-minimal
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 8/jdk/ubi/ubi9-minimal
 
 Tags: 8u432-b06-jdk-windowsservercore-1809, 8-jdk-windowsservercore-1809, 8-windowsservercore-1809
@@ -60,18 +72,30 @@ Directory: 8/jdk/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 8u432-b06-jre-alpine, 8-jre-alpine
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
-Directory: 8/jre/alpine
+Tags: 8u432-b06-jdk-windowsservercore-ltsc2025, 8-jdk-windowsservercore-ltsc2025, 8-windowsservercore-ltsc2025
+SharedTags: 8u432-b06-jdk-windowsservercore, 8-jdk-windowsservercore, 8-windowsservercore, 8u432-b06-jdk, 8-jdk, 8
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 8/jdk/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
+
+Tags: 8u432-b06-jre-alpine-3.20, 8-jre-alpine-3.20
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 8/jre/alpine/3.20
+
+Tags: 8u432-b06-jre-alpine-3.21, 8-jre-alpine-3.21, 8u432-b06-jre-alpine, 8-jre-alpine
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 8/jre/alpine/3.21
 
 Tags: 8u432-b06-jre-focal, 8-jre-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 8/jre/ubuntu/focal
 
 Tags: 8u432-b06-jre-jammy, 8-jre-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 8/jre/ubuntu/jammy
 
 Tags: 8u432-b06-jre-nanoserver-1809, 8-jre-nanoserver-1809
@@ -90,15 +114,23 @@ Directory: 8/jre/windows/nanoserver-ltsc2022
 Builder: classic
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
+Tags: 8u432-b06-jre-nanoserver-ltsc2025, 8-jre-nanoserver-ltsc2025
+SharedTags: 8u432-b06-jre-nanoserver, 8-jre-nanoserver
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 8/jre/windows/nanoserver-ltsc2025
+Builder: classic
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 8u432-b06-jre-noble, 8-jre-noble
 SharedTags: 8u432-b06-jre, 8-jre
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 8/jre/ubuntu/noble
 
 Tags: 8u432-b06-jre-ubi9-minimal, 8-jre-ubi9-minimal
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 8/jre/ubi/ubi9-minimal
 
 Tags: 8u432-b06-jre-windowsservercore-1809, 8-jre-windowsservercore-1809
@@ -117,18 +149,30 @@ Directory: 8/jre/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 11.0.25_9-jdk-alpine, 11-jdk-alpine, 11-alpine
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
-Directory: 11/jdk/alpine
+Tags: 8u432-b06-jre-windowsservercore-ltsc2025, 8-jre-windowsservercore-ltsc2025
+SharedTags: 8u432-b06-jre-windowsservercore, 8-jre-windowsservercore, 8u432-b06-jre, 8-jre
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 8/jre/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
+
+Tags: 11.0.25_9-jdk-alpine-3.20, 11-jdk-alpine-3.20, 11-alpine-3.20
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 11/jdk/alpine/3.20
+
+Tags: 11.0.25_9-jdk-alpine-3.21, 11-jdk-alpine-3.21, 11-alpine-3.21, 11.0.25_9-jdk-alpine, 11-jdk-alpine, 11-alpine
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 11/jdk/alpine/3.21
 
 Tags: 11.0.25_9-jdk-focal, 11-jdk-focal, 11-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 11/jdk/ubuntu/focal
 
 Tags: 11.0.25_9-jdk-jammy, 11-jdk-jammy, 11-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 11/jdk/ubuntu/jammy
 
 Tags: 11.0.25_9-jdk-nanoserver-1809, 11-jdk-nanoserver-1809, 11-nanoserver-1809
@@ -147,15 +191,23 @@ Directory: 11/jdk/windows/nanoserver-ltsc2022
 Builder: classic
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
+Tags: 11.0.25_9-jdk-nanoserver-ltsc2025, 11-jdk-nanoserver-ltsc2025, 11-nanoserver-ltsc2025
+SharedTags: 11.0.25_9-jdk-nanoserver, 11-jdk-nanoserver, 11-nanoserver
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 11/jdk/windows/nanoserver-ltsc2025
+Builder: classic
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 11.0.25_9-jdk-noble, 11-jdk-noble, 11-noble
 SharedTags: 11.0.25_9-jdk, 11-jdk, 11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 11/jdk/ubuntu/noble
 
 Tags: 11.0.25_9-jdk-ubi9-minimal, 11-jdk-ubi9-minimal, 11-ubi9-minimal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 11/jdk/ubi/ubi9-minimal
 
 Tags: 11.0.25_9-jdk-windowsservercore-1809, 11-jdk-windowsservercore-1809, 11-windowsservercore-1809
@@ -174,18 +226,30 @@ Directory: 11/jdk/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 11.0.25_9-jre-alpine, 11-jre-alpine
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
-Directory: 11/jre/alpine
+Tags: 11.0.25_9-jdk-windowsservercore-ltsc2025, 11-jdk-windowsservercore-ltsc2025, 11-windowsservercore-ltsc2025
+SharedTags: 11.0.25_9-jdk-windowsservercore, 11-jdk-windowsservercore, 11-windowsservercore, 11.0.25_9-jdk, 11-jdk, 11
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 11/jdk/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
+
+Tags: 11.0.25_9-jre-alpine-3.20, 11-jre-alpine-3.20
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 11/jre/alpine/3.20
+
+Tags: 11.0.25_9-jre-alpine-3.21, 11-jre-alpine-3.21, 11.0.25_9-jre-alpine, 11-jre-alpine
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 11/jre/alpine/3.21
 
 Tags: 11.0.25_9-jre-focal, 11-jre-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 11/jre/ubuntu/focal
 
 Tags: 11.0.25_9-jre-jammy, 11-jre-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 11/jre/ubuntu/jammy
 
 Tags: 11.0.25_9-jre-nanoserver-1809, 11-jre-nanoserver-1809
@@ -204,15 +268,23 @@ Directory: 11/jre/windows/nanoserver-ltsc2022
 Builder: classic
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
+Tags: 11.0.25_9-jre-nanoserver-ltsc2025, 11-jre-nanoserver-ltsc2025
+SharedTags: 11.0.25_9-jre-nanoserver, 11-jre-nanoserver
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 11/jre/windows/nanoserver-ltsc2025
+Builder: classic
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 11.0.25_9-jre-noble, 11-jre-noble
 SharedTags: 11.0.25_9-jre, 11-jre
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 11/jre/ubuntu/noble
 
 Tags: 11.0.25_9-jre-ubi9-minimal, 11-jre-ubi9-minimal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 11/jre/ubi/ubi9-minimal
 
 Tags: 11.0.25_9-jre-windowsservercore-1809, 11-jre-windowsservercore-1809
@@ -231,18 +303,30 @@ Directory: 11/jre/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 17.0.13_11-jdk-alpine, 17-jdk-alpine, 17-alpine
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
-Directory: 17/jdk/alpine
+Tags: 11.0.25_9-jre-windowsservercore-ltsc2025, 11-jre-windowsservercore-ltsc2025
+SharedTags: 11.0.25_9-jre-windowsservercore, 11-jre-windowsservercore, 11.0.25_9-jre, 11-jre
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 11/jre/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
+
+Tags: 17.0.13_11-jdk-alpine-3.20, 17-jdk-alpine-3.20, 17-alpine-3.20
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 17/jdk/alpine/3.20
+
+Tags: 17.0.13_11-jdk-alpine-3.21, 17-jdk-alpine-3.21, 17-alpine-3.21, 17.0.13_11-jdk-alpine, 17-jdk-alpine, 17-alpine
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 17/jdk/alpine/3.21
 
 Tags: 17.0.13_11-jdk-focal, 17-jdk-focal, 17-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 17/jdk/ubuntu/focal
 
 Tags: 17.0.13_11-jdk-jammy, 17-jdk-jammy, 17-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 17/jdk/ubuntu/jammy
 
 Tags: 17.0.13_11-jdk-nanoserver-1809, 17-jdk-nanoserver-1809, 17-nanoserver-1809
@@ -261,15 +345,23 @@ Directory: 17/jdk/windows/nanoserver-ltsc2022
 Builder: classic
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
+Tags: 17.0.13_11-jdk-nanoserver-ltsc2025, 17-jdk-nanoserver-ltsc2025, 17-nanoserver-ltsc2025
+SharedTags: 17.0.13_11-jdk-nanoserver, 17-jdk-nanoserver, 17-nanoserver
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 17/jdk/windows/nanoserver-ltsc2025
+Builder: classic
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 17.0.13_11-jdk-noble, 17-jdk-noble, 17-noble
 SharedTags: 17.0.13_11-jdk, 17-jdk, 17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 17/jdk/ubuntu/noble
 
 Tags: 17.0.13_11-jdk-ubi9-minimal, 17-jdk-ubi9-minimal, 17-ubi9-minimal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 17/jdk/ubi/ubi9-minimal
 
 Tags: 17.0.13_11-jdk-windowsservercore-1809, 17-jdk-windowsservercore-1809, 17-windowsservercore-1809
@@ -288,18 +380,30 @@ Directory: 17/jdk/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 17.0.13_11-jre-alpine, 17-jre-alpine
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
-Directory: 17/jre/alpine
+Tags: 17.0.13_11-jdk-windowsservercore-ltsc2025, 17-jdk-windowsservercore-ltsc2025, 17-windowsservercore-ltsc2025
+SharedTags: 17.0.13_11-jdk-windowsservercore, 17-jdk-windowsservercore, 17-windowsservercore, 17.0.13_11-jdk, 17-jdk, 17
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 17/jdk/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
+
+Tags: 17.0.13_11-jre-alpine-3.20, 17-jre-alpine-3.20
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 17/jre/alpine/3.20
+
+Tags: 17.0.13_11-jre-alpine-3.21, 17-jre-alpine-3.21, 17.0.13_11-jre-alpine, 17-jre-alpine
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 17/jre/alpine/3.21
 
 Tags: 17.0.13_11-jre-focal, 17-jre-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 17/jre/ubuntu/focal
 
 Tags: 17.0.13_11-jre-jammy, 17-jre-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 17/jre/ubuntu/jammy
 
 Tags: 17.0.13_11-jre-nanoserver-1809, 17-jre-nanoserver-1809
@@ -318,15 +422,23 @@ Directory: 17/jre/windows/nanoserver-ltsc2022
 Builder: classic
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
+Tags: 17.0.13_11-jre-nanoserver-ltsc2025, 17-jre-nanoserver-ltsc2025
+SharedTags: 17.0.13_11-jre-nanoserver, 17-jre-nanoserver
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 17/jre/windows/nanoserver-ltsc2025
+Builder: classic
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 17.0.13_11-jre-noble, 17-jre-noble
 SharedTags: 17.0.13_11-jre, 17-jre
 Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 17/jre/ubuntu/noble
 
 Tags: 17.0.13_11-jre-ubi9-minimal, 17-jre-ubi9-minimal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 17/jre/ubi/ubi9-minimal
 
 Tags: 17.0.13_11-jre-windowsservercore-1809, 17-jre-windowsservercore-1809
@@ -345,14 +457,27 @@ Directory: 17/jre/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 21.0.5_11-jdk-alpine, 21-jdk-alpine, 21-alpine
+Tags: 17.0.13_11-jre-windowsservercore-ltsc2025, 17-jre-windowsservercore-ltsc2025
+SharedTags: 17.0.13_11-jre-windowsservercore, 17-jre-windowsservercore, 17.0.13_11-jre, 17-jre
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 17/jre/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
+
+Tags: 21.0.5_11-jdk-alpine-3.20, 21-jdk-alpine-3.20, 21-alpine-3.20
 Architectures: amd64, arm64v8
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
-Directory: 21/jdk/alpine
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 21/jdk/alpine/3.20
+
+Tags: 21.0.5_11-jdk-alpine-3.21, 21-jdk-alpine-3.21, 21-alpine-3.21, 21.0.5_11-jdk-alpine, 21-jdk-alpine, 21-alpine
+Architectures: amd64, arm64v8
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 21/jdk/alpine/3.21
 
 Tags: 21.0.5_11-jdk-jammy, 21-jdk-jammy, 21-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 21/jdk/ubuntu/jammy
 
 Tags: 21.0.5_11-jdk-nanoserver-1809, 21-jdk-nanoserver-1809, 21-nanoserver-1809
@@ -371,15 +496,23 @@ Directory: 21/jdk/windows/nanoserver-ltsc2022
 Builder: classic
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
+Tags: 21.0.5_11-jdk-nanoserver-ltsc2025, 21-jdk-nanoserver-ltsc2025, 21-nanoserver-ltsc2025
+SharedTags: 21.0.5_11-jdk-nanoserver, 21-jdk-nanoserver, 21-nanoserver
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 21/jdk/windows/nanoserver-ltsc2025
+Builder: classic
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 21.0.5_11-jdk-noble, 21-jdk-noble, 21-noble
 SharedTags: 21.0.5_11-jdk, 21-jdk, 21, latest
 Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 21/jdk/ubuntu/noble
 
 Tags: 21.0.5_11-jdk-ubi9-minimal, 21-jdk-ubi9-minimal, 21-ubi9-minimal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 21/jdk/ubi/ubi9-minimal
 
 Tags: 21.0.5_11-jdk-windowsservercore-1809, 21-jdk-windowsservercore-1809, 21-windowsservercore-1809
@@ -398,14 +531,27 @@ Directory: 21/jdk/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 21.0.5_11-jre-alpine, 21-jre-alpine
+Tags: 21.0.5_11-jdk-windowsservercore-ltsc2025, 21-jdk-windowsservercore-ltsc2025, 21-windowsservercore-ltsc2025
+SharedTags: 21.0.5_11-jdk-windowsservercore, 21-jdk-windowsservercore, 21-windowsservercore, 21.0.5_11-jdk, 21-jdk, 21, latest
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 21/jdk/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
+
+Tags: 21.0.5_11-jre-alpine-3.20, 21-jre-alpine-3.20
 Architectures: amd64, arm64v8
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
-Directory: 21/jre/alpine
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 21/jre/alpine/3.20
+
+Tags: 21.0.5_11-jre-alpine-3.21, 21-jre-alpine-3.21, 21.0.5_11-jre-alpine, 21-jre-alpine
+Architectures: amd64, arm64v8
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 21/jre/alpine/3.21
 
 Tags: 21.0.5_11-jre-jammy, 21-jre-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 21/jre/ubuntu/jammy
 
 Tags: 21.0.5_11-jre-nanoserver-1809, 21-jre-nanoserver-1809
@@ -424,15 +570,23 @@ Directory: 21/jre/windows/nanoserver-ltsc2022
 Builder: classic
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
+Tags: 21.0.5_11-jre-nanoserver-ltsc2025, 21-jre-nanoserver-ltsc2025
+SharedTags: 21.0.5_11-jre-nanoserver, 21-jre-nanoserver
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 21/jre/windows/nanoserver-ltsc2025
+Builder: classic
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 21.0.5_11-jre-noble, 21-jre-noble
 SharedTags: 21.0.5_11-jre, 21-jre
 Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 21/jre/ubuntu/noble
 
 Tags: 21.0.5_11-jre-ubi9-minimal, 21-jre-ubi9-minimal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 21/jre/ubi/ubi9-minimal
 
 Tags: 21.0.5_11-jre-windowsservercore-1809, 21-jre-windowsservercore-1809
@@ -451,10 +605,23 @@ Directory: 21/jre/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 23.0.1_11-jdk-alpine, 23-jdk-alpine, 23-alpine
+Tags: 21.0.5_11-jre-windowsservercore-ltsc2025, 21-jre-windowsservercore-ltsc2025
+SharedTags: 21.0.5_11-jre-windowsservercore, 21-jre-windowsservercore, 21.0.5_11-jre, 21-jre
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 21/jre/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
+
+Tags: 23.0.1_11-jdk-alpine-3.20, 23-jdk-alpine-3.20, 23-alpine-3.20
 Architectures: amd64, arm64v8
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
-Directory: 23/jdk/alpine
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 23/jdk/alpine/3.20
+
+Tags: 23.0.1_11-jdk-alpine-3.21, 23-jdk-alpine-3.21, 23-alpine-3.21, 23.0.1_11-jdk-alpine, 23-jdk-alpine, 23-alpine
+Architectures: amd64, arm64v8
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 23/jdk/alpine/3.21
 
 Tags: 23.0.1_11-jdk-nanoserver-1809, 23-jdk-nanoserver-1809, 23-nanoserver-1809
 SharedTags: 23.0.1_11-jdk-nanoserver, 23-jdk-nanoserver, 23-nanoserver
@@ -472,15 +639,23 @@ Directory: 23/jdk/windows/nanoserver-ltsc2022
 Builder: classic
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
+Tags: 23.0.1_11-jdk-nanoserver-ltsc2025, 23-jdk-nanoserver-ltsc2025, 23-nanoserver-ltsc2025
+SharedTags: 23.0.1_11-jdk-nanoserver, 23-jdk-nanoserver, 23-nanoserver
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 23/jdk/windows/nanoserver-ltsc2025
+Builder: classic
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 23.0.1_11-jdk-noble, 23-jdk-noble, 23-noble
 SharedTags: 23.0.1_11-jdk, 23-jdk, 23
 Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 23/jdk/ubuntu/noble
 
 Tags: 23.0.1_11-jdk-ubi9-minimal, 23-jdk-ubi9-minimal, 23-ubi9-minimal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 23/jdk/ubi/ubi9-minimal
 
 Tags: 23.0.1_11-jdk-windowsservercore-1809, 23-jdk-windowsservercore-1809, 23-windowsservercore-1809
@@ -499,10 +674,23 @@ Directory: 23/jdk/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 23.0.1_11-jre-alpine, 23-jre-alpine
+Tags: 23.0.1_11-jdk-windowsservercore-ltsc2025, 23-jdk-windowsservercore-ltsc2025, 23-windowsservercore-ltsc2025
+SharedTags: 23.0.1_11-jdk-windowsservercore, 23-jdk-windowsservercore, 23-windowsservercore, 23.0.1_11-jdk, 23-jdk, 23
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 23/jdk/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
+
+Tags: 23.0.1_11-jre-alpine-3.20, 23-jre-alpine-3.20
 Architectures: amd64, arm64v8
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
-Directory: 23/jre/alpine
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 23/jre/alpine/3.20
+
+Tags: 23.0.1_11-jre-alpine-3.21, 23-jre-alpine-3.21, 23.0.1_11-jre-alpine, 23-jre-alpine
+Architectures: amd64, arm64v8
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 23/jre/alpine/3.21
 
 Tags: 23.0.1_11-jre-nanoserver-1809, 23-jre-nanoserver-1809
 SharedTags: 23.0.1_11-jre-nanoserver, 23-jre-nanoserver
@@ -520,15 +708,23 @@ Directory: 23/jre/windows/nanoserver-ltsc2022
 Builder: classic
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
+Tags: 23.0.1_11-jre-nanoserver-ltsc2025, 23-jre-nanoserver-ltsc2025
+SharedTags: 23.0.1_11-jre-nanoserver, 23-jre-nanoserver
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 23/jre/windows/nanoserver-ltsc2025
+Builder: classic
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 23.0.1_11-jre-noble, 23-jre-noble
 SharedTags: 23.0.1_11-jre, 23-jre
 Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 23/jre/ubuntu/noble
 
 Tags: 23.0.1_11-jre-ubi9-minimal, 23-jre-ubi9-minimal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
 Directory: 23/jre/ubi/ubi9-minimal
 
 Tags: 23.0.1_11-jre-windowsservercore-1809, 23-jre-windowsservercore-1809
@@ -546,3 +742,11 @@ GitCommit: d7a5038edcd8ab08b0babaeae09d0c097453a023
 Directory: 23/jre/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
+
+Tags: 23.0.1_11-jre-windowsservercore-ltsc2025, 23-jre-windowsservercore-ltsc2025
+SharedTags: 23.0.1_11-jre-windowsservercore, 23-jre-windowsservercore, 23.0.1_11-jre, 23-jre
+Architectures: windows-amd64
+GitCommit: a48d4a514dd752611cea7d0b6a3e9da4282550f8
+Directory: 23/jre/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index 30c05aa..06620d9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,286 +1,386 @@
 eclipse-temurin:8
 eclipse-temurin:8u432-b06-jdk
 eclipse-temurin:8u432-b06-jdk-alpine
+eclipse-temurin:8u432-b06-jdk-alpine-3.20
+eclipse-temurin:8u432-b06-jdk-alpine-3.21
 eclipse-temurin:8u432-b06-jdk-focal
 eclipse-temurin:8u432-b06-jdk-jammy
 eclipse-temurin:8u432-b06-jdk-nanoserver
 eclipse-temurin:8u432-b06-jdk-nanoserver-1809
 eclipse-temurin:8u432-b06-jdk-nanoserver-ltsc2022
+eclipse-temurin:8u432-b06-jdk-nanoserver-ltsc2025
 eclipse-temurin:8u432-b06-jdk-noble
 eclipse-temurin:8u432-b06-jdk-ubi9-minimal
 eclipse-temurin:8u432-b06-jdk-windowsservercore
 eclipse-temurin:8u432-b06-jdk-windowsservercore-1809
 eclipse-temurin:8u432-b06-jdk-windowsservercore-ltsc2022
+eclipse-temurin:8u432-b06-jdk-windowsservercore-ltsc2025
 eclipse-temurin:8u432-b06-jre
 eclipse-temurin:8u432-b06-jre-alpine
+eclipse-temurin:8u432-b06-jre-alpine-3.20
+eclipse-temurin:8u432-b06-jre-alpine-3.21
 eclipse-temurin:8u432-b06-jre-focal
 eclipse-temurin:8u432-b06-jre-jammy
 eclipse-temurin:8u432-b06-jre-nanoserver
 eclipse-temurin:8u432-b06-jre-nanoserver-1809
 eclipse-temurin:8u432-b06-jre-nanoserver-ltsc2022
+eclipse-temurin:8u432-b06-jre-nanoserver-ltsc2025
 eclipse-temurin:8u432-b06-jre-noble
 eclipse-temurin:8u432-b06-jre-ubi9-minimal
 eclipse-temurin:8u432-b06-jre-windowsservercore
 eclipse-temurin:8u432-b06-jre-windowsservercore-1809
 eclipse-temurin:8u432-b06-jre-windowsservercore-ltsc2022
+eclipse-temurin:8u432-b06-jre-windowsservercore-ltsc2025
 eclipse-temurin:8-alpine
+eclipse-temurin:8-alpine-3.20
+eclipse-temurin:8-alpine-3.21
 eclipse-temurin:8-focal
 eclipse-temurin:8-jammy
 eclipse-temurin:8-jdk
 eclipse-temurin:8-jdk-alpine
+eclipse-temurin:8-jdk-alpine-3.20
+eclipse-temurin:8-jdk-alpine-3.21
 eclipse-temurin:8-jdk-focal
 eclipse-temurin:8-jdk-jammy
 eclipse-temurin:8-jdk-nanoserver
 eclipse-temurin:8-jdk-nanoserver-1809
 eclipse-temurin:8-jdk-nanoserver-ltsc2022
+eclipse-temurin:8-jdk-nanoserver-ltsc2025
 eclipse-temurin:8-jdk-noble
 eclipse-temurin:8-jdk-ubi9-minimal
 eclipse-temurin:8-jdk-windowsservercore
 eclipse-temurin:8-jdk-windowsservercore-1809
 eclipse-temurin:8-jdk-windowsservercore-ltsc2022
+eclipse-temurin:8-jdk-windowsservercore-ltsc2025
 eclipse-temurin:8-jre
 eclipse-temurin:8-jre-alpine
+eclipse-temurin:8-jre-alpine-3.20
+eclipse-temurin:8-jre-alpine-3.21
 eclipse-temurin:8-jre-focal
 eclipse-temurin:8-jre-jammy
 eclipse-temurin:8-jre-nanoserver
 eclipse-temurin:8-jre-nanoserver-1809
 eclipse-temurin:8-jre-nanoserver-ltsc2022
+eclipse-temurin:8-jre-nanoserver-ltsc2025
 eclipse-temurin:8-jre-noble
 eclipse-temurin:8-jre-ubi9-minimal
 eclipse-temurin:8-jre-windowsservercore
 eclipse-temurin:8-jre-windowsservercore-1809
 eclipse-temurin:8-jre-windowsservercore-ltsc2022
+eclipse-temurin:8-jre-windowsservercore-ltsc2025
 eclipse-temurin:8-nanoserver
 eclipse-temurin:8-nanoserver-1809
 eclipse-temurin:8-nanoserver-ltsc2022
+eclipse-temurin:8-nanoserver-ltsc2025
 eclipse-temurin:8-noble
 eclipse-temurin:8-ubi9-minimal
 eclipse-temurin:8-windowsservercore
 eclipse-temurin:8-windowsservercore-1809
 eclipse-temurin:8-windowsservercore-ltsc2022
+eclipse-temurin:8-windowsservercore-ltsc2025
 eclipse-temurin:11
 eclipse-temurin:11-alpine
+eclipse-temurin:11-alpine-3.20
+eclipse-temurin:11-alpine-3.21
 eclipse-temurin:11-focal
 eclipse-temurin:11-jammy
 eclipse-temurin:11-jdk
 eclipse-temurin:11-jdk-alpine
+eclipse-temurin:11-jdk-alpine-3.20
+eclipse-temurin:11-jdk-alpine-3.21
 eclipse-temurin:11-jdk-focal
 eclipse-temurin:11-jdk-jammy
 eclipse-temurin:11-jdk-nanoserver
 eclipse-temurin:11-jdk-nanoserver-1809
 eclipse-temurin:11-jdk-nanoserver-ltsc2022
+eclipse-temurin:11-jdk-nanoserver-ltsc2025
 eclipse-temurin:11-jdk-noble
 eclipse-temurin:11-jdk-ubi9-minimal
 eclipse-temurin:11-jdk-windowsservercore
 eclipse-temurin:11-jdk-windowsservercore-1809
 eclipse-temurin:11-jdk-windowsservercore-ltsc2022
+eclipse-temurin:11-jdk-windowsservercore-ltsc2025
 eclipse-temurin:11-jre
 eclipse-temurin:11-jre-alpine
+eclipse-temurin:11-jre-alpine-3.20
+eclipse-temurin:11-jre-alpine-3.21
 eclipse-temurin:11-jre-focal
 eclipse-temurin:11-jre-jammy
 eclipse-temurin:11-jre-nanoserver
 eclipse-temurin:11-jre-nanoserver-1809
 eclipse-temurin:11-jre-nanoserver-ltsc2022
+eclipse-temurin:11-jre-nanoserver-ltsc2025
 eclipse-temurin:11-jre-noble
 eclipse-temurin:11-jre-ubi9-minimal
 eclipse-temurin:11-jre-windowsservercore
 eclipse-temurin:11-jre-windowsservercore-1809
 eclipse-temurin:11-jre-windowsservercore-ltsc2022
+eclipse-temurin:11-jre-windowsservercore-ltsc2025
 eclipse-temurin:11-nanoserver
 eclipse-temurin:11-nanoserver-1809
 eclipse-temurin:11-nanoserver-ltsc2022
+eclipse-temurin:11-nanoserver-ltsc2025
 eclipse-temurin:11-noble
 eclipse-temurin:11-ubi9-minimal
 eclipse-temurin:11-windowsservercore
 eclipse-temurin:11-windowsservercore-1809
 eclipse-temurin:11-windowsservercore-ltsc2022
+eclipse-temurin:11-windowsservercore-ltsc2025
 eclipse-temurin:11.0.25_9-jdk
 eclipse-temurin:11.0.25_9-jdk-alpine
+eclipse-temurin:11.0.25_9-jdk-alpine-3.20
+eclipse-temurin:11.0.25_9-jdk-alpine-3.21
 eclipse-temurin:11.0.25_9-jdk-focal
 eclipse-temurin:11.0.25_9-jdk-jammy
 eclipse-temurin:11.0.25_9-jdk-nanoserver
 eclipse-temurin:11.0.25_9-jdk-nanoserver-1809
 eclipse-temurin:11.0.25_9-jdk-nanoserver-ltsc2022
+eclipse-temurin:11.0.25_9-jdk-nanoserver-ltsc2025
 eclipse-temurin:11.0.25_9-jdk-noble
 eclipse-temurin:11.0.25_9-jdk-ubi9-minimal
 eclipse-temurin:11.0.25_9-jdk-windowsservercore
 eclipse-temurin:11.0.25_9-jdk-windowsservercore-1809
 eclipse-temurin:11.0.25_9-jdk-windowsservercore-ltsc2022
+eclipse-temurin:11.0.25_9-jdk-windowsservercore-ltsc2025
 eclipse-temurin:11.0.25_9-jre
 eclipse-temurin:11.0.25_9-jre-alpine
+eclipse-temurin:11.0.25_9-jre-alpine-3.20
+eclipse-temurin:11.0.25_9-jre-alpine-3.21
 eclipse-temurin:11.0.25_9-jre-focal
 eclipse-temurin:11.0.25_9-jre-jammy
 eclipse-temurin:11.0.25_9-jre-nanoserver
 eclipse-temurin:11.0.25_9-jre-nanoserver-1809
 eclipse-temurin:11.0.25_9-jre-nanoserver-ltsc2022
+eclipse-temurin:11.0.25_9-jre-nanoserver-ltsc2025
 eclipse-temurin:11.0.25_9-jre-noble
 eclipse-temurin:11.0.25_9-jre-ubi9-minimal
 eclipse-temurin:11.0.25_9-jre-windowsservercore
 eclipse-temurin:11.0.25_9-jre-windowsservercore-1809
 eclipse-temurin:11.0.25_9-jre-windowsservercore-ltsc2022
+eclipse-temurin:11.0.25_9-jre-windowsservercore-ltsc2025
 eclipse-temurin:17
 eclipse-temurin:17-alpine
+eclipse-temurin:17-alpine-3.20
+eclipse-temurin:17-alpine-3.21
 eclipse-temurin:17-focal
 eclipse-temurin:17-jammy
 eclipse-temurin:17-jdk
 eclipse-temurin:17-jdk-alpine
+eclipse-temurin:17-jdk-alpine-3.20
+eclipse-temurin:17-jdk-alpine-3.21
 eclipse-temurin:17-jdk-focal
 eclipse-temurin:17-jdk-jammy
 eclipse-temurin:17-jdk-nanoserver
 eclipse-temurin:17-jdk-nanoserver-1809
 eclipse-temurin:17-jdk-nanoserver-ltsc2022
+eclipse-temurin:17-jdk-nanoserver-ltsc2025
 eclipse-temurin:17-jdk-noble
 eclipse-temurin:17-jdk-ubi9-minimal
 eclipse-temurin:17-jdk-windowsservercore
 eclipse-temurin:17-jdk-windowsservercore-1809
 eclipse-temurin:17-jdk-windowsservercore-ltsc2022
+eclipse-temurin:17-jdk-windowsservercore-ltsc2025
 eclipse-temurin:17-jre
 eclipse-temurin:17-jre-alpine
+eclipse-temurin:17-jre-alpine-3.20
+eclipse-temurin:17-jre-alpine-3.21
 eclipse-temurin:17-jre-focal
 eclipse-temurin:17-jre-jammy
 eclipse-temurin:17-jre-nanoserver
 eclipse-temurin:17-jre-nanoserver-1809
 eclipse-temurin:17-jre-nanoserver-ltsc2022
+eclipse-temurin:17-jre-nanoserver-ltsc2025
 eclipse-temurin:17-jre-noble
 eclipse-temurin:17-jre-ubi9-minimal
 eclipse-temurin:17-jre-windowsservercore
 eclipse-temurin:17-jre-windowsservercore-1809
 eclipse-temurin:17-jre-windowsservercore-ltsc2022
+eclipse-temurin:17-jre-windowsservercore-ltsc2025
 eclipse-temurin:17-nanoserver
 eclipse-temurin:17-nanoserver-1809
 eclipse-temurin:17-nanoserver-ltsc2022
+eclipse-temurin:17-nanoserver-ltsc2025
 eclipse-temurin:17-noble
 eclipse-temurin:17-ubi9-minimal
 eclipse-temurin:17-windowsservercore
 eclipse-temurin:17-windowsservercore-1809
 eclipse-temurin:17-windowsservercore-ltsc2022
+eclipse-temurin:17-windowsservercore-ltsc2025
 eclipse-temurin:17.0.13_11-jdk
 eclipse-temurin:17.0.13_11-jdk-alpine
+eclipse-temurin:17.0.13_11-jdk-alpine-3.20
+eclipse-temurin:17.0.13_11-jdk-alpine-3.21
 eclipse-temurin:17.0.13_11-jdk-focal
 eclipse-temurin:17.0.13_11-jdk-jammy
 eclipse-temurin:17.0.13_11-jdk-nanoserver
 eclipse-temurin:17.0.13_11-jdk-nanoserver-1809
 eclipse-temurin:17.0.13_11-jdk-nanoserver-ltsc2022
+eclipse-temurin:17.0.13_11-jdk-nanoserver-ltsc2025
 eclipse-temurin:17.0.13_11-jdk-noble
 eclipse-temurin:17.0.13_11-jdk-ubi9-minimal
 eclipse-temurin:17.0.13_11-jdk-windowsservercore
 eclipse-temurin:17.0.13_11-jdk-windowsservercore-1809
 eclipse-temurin:17.0.13_11-jdk-windowsservercore-ltsc2022
+eclipse-temurin:17.0.13_11-jdk-windowsservercore-ltsc2025
 eclipse-temurin:17.0.13_11-jre
 eclipse-temurin:17.0.13_11-jre-alpine
+eclipse-temurin:17.0.13_11-jre-alpine-3.20
+eclipse-temurin:17.0.13_11-jre-alpine-3.21
 eclipse-temurin:17.0.13_11-jre-focal
 eclipse-temurin:17.0.13_11-jre-jammy
 eclipse-temurin:17.0.13_11-jre-nanoserver
 eclipse-temurin:17.0.13_11-jre-nanoserver-1809
 eclipse-temurin:17.0.13_11-jre-nanoserver-ltsc2022
+eclipse-temurin:17.0.13_11-jre-nanoserver-ltsc2025
 eclipse-temurin:17.0.13_11-jre-noble
 eclipse-temurin:17.0.13_11-jre-ubi9-minimal
 eclipse-temurin:17.0.13_11-jre-windowsservercore
 eclipse-temurin:17.0.13_11-jre-windowsservercore-1809
 eclipse-temurin:17.0.13_11-jre-windowsservercore-ltsc2022
+eclipse-temurin:17.0.13_11-jre-windowsservercore-ltsc2025
 eclipse-temurin:21
 eclipse-temurin:21-alpine
+eclipse-temurin:21-alpine-3.20
+eclipse-temurin:21-alpine-3.21
 eclipse-temurin:21-jammy
 eclipse-temurin:21-jdk
 eclipse-temurin:21-jdk-alpine
+eclipse-temurin:21-jdk-alpine-3.20
+eclipse-temurin:21-jdk-alpine-3.21
 eclipse-temurin:21-jdk-jammy
 eclipse-temurin:21-jdk-nanoserver
 eclipse-temurin:21-jdk-nanoserver-1809
 eclipse-temurin:21-jdk-nanoserver-ltsc2022
+eclipse-temurin:21-jdk-nanoserver-ltsc2025
 eclipse-temurin:21-jdk-noble
 eclipse-temurin:21-jdk-ubi9-minimal
 eclipse-temurin:21-jdk-windowsservercore
 eclipse-temurin:21-jdk-windowsservercore-1809
 eclipse-temurin:21-jdk-windowsservercore-ltsc2022
+eclipse-temurin:21-jdk-windowsservercore-ltsc2025
 eclipse-temurin:21-jre
 eclipse-temurin:21-jre-alpine
+eclipse-temurin:21-jre-alpine-3.20
+eclipse-temurin:21-jre-alpine-3.21
 eclipse-temurin:21-jre-jammy
 eclipse-temurin:21-jre-nanoserver
 eclipse-temurin:21-jre-nanoserver-1809
 eclipse-temurin:21-jre-nanoserver-ltsc2022
+eclipse-temurin:21-jre-nanoserver-ltsc2025
 eclipse-temurin:21-jre-noble
 eclipse-temurin:21-jre-ubi9-minimal
 eclipse-temurin:21-jre-windowsservercore
 eclipse-temurin:21-jre-windowsservercore-1809
 eclipse-temurin:21-jre-windowsservercore-ltsc2022
+eclipse-temurin:21-jre-windowsservercore-ltsc2025
 eclipse-temurin:21-nanoserver
 eclipse-temurin:21-nanoserver-1809
 eclipse-temurin:21-nanoserver-ltsc2022
+eclipse-temurin:21-nanoserver-ltsc2025
 eclipse-temurin:21-noble
 eclipse-temurin:21-ubi9-minimal
 eclipse-temurin:21-windowsservercore
 eclipse-temurin:21-windowsservercore-1809
 eclipse-temurin:21-windowsservercore-ltsc2022
+eclipse-temurin:21-windowsservercore-ltsc2025
 eclipse-temurin:21.0.5_11-jdk
 eclipse-temurin:21.0.5_11-jdk-alpine
+eclipse-temurin:21.0.5_11-jdk-alpine-3.20
+eclipse-temurin:21.0.5_11-jdk-alpine-3.21
 eclipse-temurin:21.0.5_11-jdk-jammy
 eclipse-temurin:21.0.5_11-jdk-nanoserver
 eclipse-temurin:21.0.5_11-jdk-nanoserver-1809
 eclipse-temurin:21.0.5_11-jdk-nanoserver-ltsc2022
+eclipse-temurin:21.0.5_11-jdk-nanoserver-ltsc2025
 eclipse-temurin:21.0.5_11-jdk-noble
 eclipse-temurin:21.0.5_11-jdk-ubi9-minimal
 eclipse-temurin:21.0.5_11-jdk-windowsservercore
 eclipse-temurin:21.0.5_11-jdk-windowsservercore-1809
 eclipse-temurin:21.0.5_11-jdk-windowsservercore-ltsc2022
+eclipse-temurin:21.0.5_11-jdk-windowsservercore-ltsc2025
 eclipse-temurin:21.0.5_11-jre
 eclipse-temurin:21.0.5_11-jre-alpine
+eclipse-temurin:21.0.5_11-jre-alpine-3.20
+eclipse-temurin:21.0.5_11-jre-alpine-3.21
 eclipse-temurin:21.0.5_11-jre-jammy
 eclipse-temurin:21.0.5_11-jre-nanoserver
 eclipse-temurin:21.0.5_11-jre-nanoserver-1809
 eclipse-temurin:21.0.5_11-jre-nanoserver-ltsc2022
+eclipse-temurin:21.0.5_11-jre-nanoserver-ltsc2025
 eclipse-temurin:21.0.5_11-jre-noble
 eclipse-temurin:21.0.5_11-jre-ubi9-minimal
 eclipse-temurin:21.0.5_11-jre-windowsservercore
 eclipse-temurin:21.0.5_11-jre-windowsservercore-1809
 eclipse-temurin:21.0.5_11-jre-windowsservercore-ltsc2022
+eclipse-temurin:21.0.5_11-jre-windowsservercore-ltsc2025
 eclipse-temurin:23
 eclipse-temurin:23-alpine
+eclipse-temurin:23-alpine-3.20
+eclipse-temurin:23-alpine-3.21
 eclipse-temurin:23-jdk
 eclipse-temurin:23-jdk-alpine
+eclipse-temurin:23-jdk-alpine-3.20
+eclipse-temurin:23-jdk-alpine-3.21
 eclipse-temurin:23-jdk-nanoserver
 eclipse-temurin:23-jdk-nanoserver-1809
 eclipse-temurin:23-jdk-nanoserver-ltsc2022
+eclipse-temurin:23-jdk-nanoserver-ltsc2025
 eclipse-temurin:23-jdk-noble
 eclipse-temurin:23-jdk-ubi9-minimal
 eclipse-temurin:23-jdk-windowsservercore
 eclipse-temurin:23-jdk-windowsservercore-1809
 eclipse-temurin:23-jdk-windowsservercore-ltsc2022
+eclipse-temurin:23-jdk-windowsservercore-ltsc2025
 eclipse-temurin:23-jre
 eclipse-temurin:23-jre-alpine
+eclipse-temurin:23-jre-alpine-3.20
+eclipse-temurin:23-jre-alpine-3.21
 eclipse-temurin:23-jre-nanoserver
 eclipse-temurin:23-jre-nanoserver-1809
 eclipse-temurin:23-jre-nanoserver-ltsc2022
+eclipse-temurin:23-jre-nanoserver-ltsc2025
 eclipse-temurin:23-jre-noble
 eclipse-temurin:23-jre-ubi9-minimal
 eclipse-temurin:23-jre-windowsservercore
 eclipse-temurin:23-jre-windowsservercore-1809
 eclipse-temurin:23-jre-windowsservercore-ltsc2022
+eclipse-temurin:23-jre-windowsservercore-ltsc2025
 eclipse-temurin:23-nanoserver
 eclipse-temurin:23-nanoserver-1809
 eclipse-temurin:23-nanoserver-ltsc2022
+eclipse-temurin:23-nanoserver-ltsc2025
 eclipse-temurin:23-noble
 eclipse-temurin:23-ubi9-minimal
 eclipse-temurin:23-windowsservercore
 eclipse-temurin:23-windowsservercore-1809
 eclipse-temurin:23-windowsservercore-ltsc2022
+eclipse-temurin:23-windowsservercore-ltsc2025
 eclipse-temurin:23.0.1_11-jdk
 eclipse-temurin:23.0.1_11-jdk-alpine
+eclipse-temurin:23.0.1_11-jdk-alpine-3.20
+eclipse-temurin:23.0.1_11-jdk-alpine-3.21
 eclipse-temurin:23.0.1_11-jdk-nanoserver
 eclipse-temurin:23.0.1_11-jdk-nanoserver-1809
 eclipse-temurin:23.0.1_11-jdk-nanoserver-ltsc2022
+eclipse-temurin:23.0.1_11-jdk-nanoserver-ltsc2025
 eclipse-temurin:23.0.1_11-jdk-noble
 eclipse-temurin:23.0.1_11-jdk-ubi9-minimal
 eclipse-temurin:23.0.1_11-jdk-windowsservercore
 eclipse-temurin:23.0.1_11-jdk-windowsservercore-1809
 eclipse-temurin:23.0.1_11-jdk-windowsservercore-ltsc2022
+eclipse-temurin:23.0.1_11-jdk-windowsservercore-ltsc2025
 eclipse-temurin:23.0.1_11-jre
 eclipse-temurin:23.0.1_11-jre-alpine
+eclipse-temurin:23.0.1_11-jre-alpine-3.20
+eclipse-temurin:23.0.1_11-jre-alpine-3.21
 eclipse-temurin:23.0.1_11-jre-nanoserver
 eclipse-temurin:23.0.1_11-jre-nanoserver-1809
 eclipse-temurin:23.0.1_11-jre-nanoserver-ltsc2022
+eclipse-temurin:23.0.1_11-jre-nanoserver-ltsc2025
 eclipse-temurin:23.0.1_11-jre-noble
 eclipse-temurin:23.0.1_11-jre-ubi9-minimal
 eclipse-temurin:23.0.1_11-jre-windowsservercore
 eclipse-temurin:23.0.1_11-jre-windowsservercore-1809
 eclipse-temurin:23.0.1_11-jre-windowsservercore-ltsc2022
+eclipse-temurin:23.0.1_11-jre-windowsservercore-ltsc2025
 eclipse-temurin:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 00dbfe0..6601f73 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,84 +1,114 @@
 eclipse-temurin:8-alpine
+eclipse-temurin:8-alpine-3.20
 eclipse-temurin:8-focal
 eclipse-temurin:8-jammy
 eclipse-temurin:8-jre-alpine
+eclipse-temurin:8-jre-alpine-3.20
 eclipse-temurin:8-jre-focal
 eclipse-temurin:8-jre-jammy
 eclipse-temurin:8-jre-noble
 eclipse-temurin:8-jre-ubi9-minimal
 eclipse-temurin:8-jre-windowsservercore-1809
 eclipse-temurin:8-jre-windowsservercore-ltsc2022
+eclipse-temurin:8-jre-windowsservercore-ltsc2025
 eclipse-temurin:8-noble
 eclipse-temurin:8-ubi9-minimal
 eclipse-temurin:8-windowsservercore-1809
 eclipse-temurin:8-windowsservercore-ltsc2022
+eclipse-temurin:8-windowsservercore-ltsc2025
 eclipse-temurin:11-alpine
+eclipse-temurin:11-alpine-3.20
 eclipse-temurin:11-focal
 eclipse-temurin:11-jammy
 eclipse-temurin:11-jre-alpine
+eclipse-temurin:11-jre-alpine-3.20
 eclipse-temurin:11-jre-focal
 eclipse-temurin:11-jre-jammy
 eclipse-temurin:11-jre-noble
 eclipse-temurin:11-jre-ubi9-minimal
 eclipse-temurin:11-jre-windowsservercore-1809
 eclipse-temurin:11-jre-windowsservercore-ltsc2022
+eclipse-temurin:11-jre-windowsservercore-ltsc2025
 eclipse-temurin:11-noble
 eclipse-temurin:11-ubi9-minimal
 eclipse-temurin:11-windowsservercore-1809
 eclipse-temurin:11-windowsservercore-ltsc2022
+eclipse-temurin:11-windowsservercore-ltsc2025
 eclipse-temurin:17-alpine
+eclipse-temurin:17-alpine-3.20
 eclipse-temurin:17-focal
 eclipse-temurin:17-jammy
 eclipse-temurin:17-jre-alpine
+eclipse-temurin:17-jre-alpine-3.20
 eclipse-temurin:17-jre-focal
 eclipse-temurin:17-jre-jammy
 eclipse-temurin:17-jre-noble
 eclipse-temurin:17-jre-ubi9-minimal
 eclipse-temurin:17-jre-windowsservercore-1809
 eclipse-temurin:17-jre-windowsservercore-ltsc2022
+eclipse-temurin:17-jre-windowsservercore-ltsc2025
 eclipse-temurin:17-noble
 eclipse-temurin:17-ubi9-minimal
 eclipse-temurin:17-windowsservercore-1809
 eclipse-temurin:17-windowsservercore-ltsc2022
+eclipse-temurin:17-windowsservercore-ltsc2025
 eclipse-temurin:21-alpine
+eclipse-temurin:21-alpine-3.20
 eclipse-temurin:21-jammy
 eclipse-temurin:21-jre-alpine
+eclipse-temurin:21-jre-alpine-3.20
 eclipse-temurin:21-jre-jammy
 eclipse-temurin:21-jre-noble
 eclipse-temurin:21-jre-ubi9-minimal
 eclipse-temurin:21-jre-windowsservercore-1809
 eclipse-temurin:21-jre-windowsservercore-ltsc2022
+eclipse-temurin:21-jre-windowsservercore-ltsc2025
 eclipse-temurin:21-noble
 eclipse-temurin:21-ubi9-minimal
 eclipse-temurin:21-windowsservercore-1809
 eclipse-temurin:21-windowsservercore-ltsc2022
+eclipse-temurin:21-windowsservercore-ltsc2025
 eclipse-temurin:23-alpine
+eclipse-temurin:23-alpine-3.20
 eclipse-temurin:23-jre-alpine
+eclipse-temurin:23-jre-alpine-3.20
 eclipse-temurin:23-jre-noble
 eclipse-temurin:23-jre-ubi9-minimal
 eclipse-temurin:23-jre-windowsservercore-1809
 eclipse-temurin:23-jre-windowsservercore-ltsc2022
+eclipse-temurin:23-jre-windowsservercore-ltsc2025
 eclipse-temurin:23-noble
 eclipse-temurin:23-ubi9-minimal
 eclipse-temurin:23-windowsservercore-1809
 eclipse-temurin:23-windowsservercore-ltsc2022
+eclipse-temurin:23-windowsservercore-ltsc2025
 eclipse-temurin:8-jre-nanoserver-1809
 eclipse-temurin:8-jre-nanoserver-ltsc2022
+eclipse-temurin:8-jre-nanoserver-ltsc2025
 eclipse-temurin:8-nanoserver-1809
 eclipse-temurin:8-nanoserver-ltsc2022
+eclipse-temurin:8-nanoserver-ltsc2025
 eclipse-temurin:11-jre-nanoserver-1809
 eclipse-temurin:11-jre-nanoserver-ltsc2022
+eclipse-temurin:11-jre-nanoserver-ltsc2025
 eclipse-temurin:11-nanoserver-1809
 eclipse-temurin:11-nanoserver-ltsc2022
+eclipse-temurin:11-nanoserver-ltsc2025
 eclipse-temurin:17-jre-nanoserver-1809
 eclipse-temurin:17-jre-nanoserver-ltsc2022
+eclipse-temurin:17-jre-nanoserver-ltsc2025
 eclipse-temurin:17-nanoserver-1809
 eclipse-temurin:17-nanoserver-ltsc2022
+eclipse-temurin:17-nanoserver-ltsc2025
 eclipse-temurin:21-jre-nanoserver-1809
 eclipse-temurin:21-jre-nanoserver-ltsc2022
+eclipse-temurin:21-jre-nanoserver-ltsc2025
 eclipse-temurin:21-nanoserver-1809
 eclipse-temurin:21-nanoserver-ltsc2022
+eclipse-temurin:21-nanoserver-ltsc2025
 eclipse-temurin:23-jre-nanoserver-1809
 eclipse-temurin:23-jre-nanoserver-ltsc2022
+eclipse-temurin:23-jre-nanoserver-ltsc2025
 eclipse-temurin:23-nanoserver-1809
 eclipse-temurin:23-nanoserver-ltsc2022
+eclipse-temurin:23-nanoserver-ltsc2025
diff --git a/eclipse-temurin_11-alpine/Dockerfile b/eclipse-temurin_11-alpine-3.20/Dockerfile
similarity index 98%
copy from eclipse-temurin_11-alpine/Dockerfile
copy to eclipse-temurin_11-alpine-3.20/Dockerfile
index 4756f1f..7a186cc 100644
--- a/eclipse-temurin_11-alpine/Dockerfile
+++ b/eclipse-temurin_11-alpine-3.20/Dockerfile
@@ -67,7 +67,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_11-alpine/entrypoint.sh b/eclipse-temurin_11-alpine-3.20/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_11-alpine/entrypoint.sh
copy to eclipse-temurin_11-alpine-3.20/entrypoint.sh
diff --git a/eclipse-temurin_11-alpine/Dockerfile b/eclipse-temurin_11-alpine/Dockerfile
index 4756f1f..4950c25 100644
--- a/eclipse-temurin_11-alpine/Dockerfile
+++ b/eclipse-temurin_11-alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 ENV JAVA_HOME=/opt/java/openjdk
 ENV PATH=$JAVA_HOME/bin:$PATH
@@ -67,7 +67,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_11-focal/Dockerfile b/eclipse-temurin_11-focal/Dockerfile
index b6b6611..e9246c5 100644
--- a/eclipse-temurin_11-focal/Dockerfile
+++ b/eclipse-temurin_11-focal/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_11-jammy/Dockerfile b/eclipse-temurin_11-jammy/Dockerfile
index 06c8039..ad8fa67 100644
--- a/eclipse-temurin_11-jammy/Dockerfile
+++ b/eclipse-temurin_11-jammy/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_11-jre-alpine/Dockerfile b/eclipse-temurin_11-jre-alpine-3.20/Dockerfile
similarity index 96%
copy from eclipse-temurin_11-jre-alpine/Dockerfile
copy to eclipse-temurin_11-jre-alpine-3.20/Dockerfile
index 9398260..3cbe844 100644
--- a/eclipse-temurin_11-jre-alpine/Dockerfile
+++ b/eclipse-temurin_11-jre-alpine-3.20/Dockerfile
@@ -67,7 +67,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -76,7 +76,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_11-alpine/entrypoint.sh b/eclipse-temurin_11-jre-alpine-3.20/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_11-alpine/entrypoint.sh
copy to eclipse-temurin_11-jre-alpine-3.20/entrypoint.sh
diff --git a/eclipse-temurin_11-jre-alpine/Dockerfile b/eclipse-temurin_11-jre-alpine/Dockerfile
index 9398260..7c99ce8 100644
--- a/eclipse-temurin_11-jre-alpine/Dockerfile
+++ b/eclipse-temurin_11-jre-alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 ENV JAVA_HOME=/opt/java/openjdk
 ENV PATH=$JAVA_HOME/bin:$PATH
@@ -67,7 +67,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -76,7 +76,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_11-jre-focal/Dockerfile b/eclipse-temurin_11-jre-focal/Dockerfile
index 591dc3e..ca5a885 100644
--- a/eclipse-temurin_11-jre-focal/Dockerfile
+++ b/eclipse-temurin_11-jre-focal/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -93,7 +93,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig; \
diff --git a/eclipse-temurin_11-jre-jammy/Dockerfile b/eclipse-temurin_11-jre-jammy/Dockerfile
index 1a514d3..c2c0ff6 100644
--- a/eclipse-temurin_11-jre-jammy/Dockerfile
+++ b/eclipse-temurin_11-jre-jammy/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -93,7 +93,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig; \
diff --git a/eclipse-temurin_11-jre-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_11-jre-nanoserver-ltsc2025/Dockerfile
similarity index 94%
copy from eclipse-temurin_11-jre-nanoserver-ltsc2022/Dockerfile
copy to eclipse-temurin_11-jre-nanoserver-ltsc2025/Dockerfile
index 2a40f1e..c004426 100644
--- a/eclipse-temurin_11-jre-nanoserver-ltsc2022/Dockerfile
+++ b/eclipse-temurin_11-jre-nanoserver-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -31,7 +31,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
     && echo Complete.
 USER ContainerUser
 
-COPY --from=eclipse-temurin:11.0.25_9-jre-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:11.0.25_9-jre-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo java --version && java --version \
diff --git a/eclipse-temurin_11-jre-noble/Dockerfile b/eclipse-temurin_11-jre-noble/Dockerfile
index 4141834..9ed9e8d 100644
--- a/eclipse-temurin_11-jre-noble/Dockerfile
+++ b/eclipse-temurin_11-jre-noble/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -93,7 +93,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig; \
diff --git a/eclipse-temurin_11-jre-ubi9-minimal/Dockerfile b/eclipse-temurin_11-jre-ubi9-minimal/Dockerfile
index 5fd8ce5..9778fc6 100644
--- a/eclipse-temurin_11-jre-ubi9-minimal/Dockerfile
+++ b/eclipse-temurin_11-jre-ubi9-minimal/Dockerfile
@@ -76,7 +76,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -85,7 +85,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_11-jre-windowsservercore-1809/Dockerfile b/eclipse-temurin_11-jre-windowsservercore-ltsc2025/Dockerfile
similarity index 97%
copy from eclipse-temurin_11-jre-windowsservercore-1809/Dockerfile
copy to eclipse-temurin_11-jre-windowsservercore-ltsc2025/Dockerfile
index e6271e0..2acfc55 100644
--- a/eclipse-temurin_11-jre-windowsservercore-1809/Dockerfile
+++ b/eclipse-temurin_11-jre-windowsservercore-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/eclipse-temurin_11-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_11-nanoserver-ltsc2025/Dockerfile
similarity index 94%
copy from eclipse-temurin_11-nanoserver-ltsc2022/Dockerfile
copy to eclipse-temurin_11-nanoserver-ltsc2025/Dockerfile
index 5111c26..171c17b 100644
--- a/eclipse-temurin_11-nanoserver-ltsc2022/Dockerfile
+++ b/eclipse-temurin_11-nanoserver-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -31,7 +31,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
     && echo Complete.
 USER ContainerUser
 
-COPY --from=eclipse-temurin:11.0.25_9-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:11.0.25_9-jdk-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo javac --version && javac --version \
diff --git a/eclipse-temurin_11-noble/Dockerfile b/eclipse-temurin_11-noble/Dockerfile
index c797773..fb5e565 100644
--- a/eclipse-temurin_11-noble/Dockerfile
+++ b/eclipse-temurin_11-noble/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_11-ubi9-minimal/Dockerfile b/eclipse-temurin_11-ubi9-minimal/Dockerfile
index d65f391..db561b4 100644
--- a/eclipse-temurin_11-ubi9-minimal/Dockerfile
+++ b/eclipse-temurin_11-ubi9-minimal/Dockerfile
@@ -76,7 +76,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_11-windowsservercore-1809/Dockerfile b/eclipse-temurin_11-windowsservercore-ltsc2025/Dockerfile
similarity index 98%
copy from eclipse-temurin_11-windowsservercore-1809/Dockerfile
copy to eclipse-temurin_11-windowsservercore-ltsc2025/Dockerfile
index e72844b..415cc69 100644
--- a/eclipse-temurin_11-windowsservercore-1809/Dockerfile
+++ b/eclipse-temurin_11-windowsservercore-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/eclipse-temurin_17-alpine/Dockerfile b/eclipse-temurin_17-alpine-3.20/Dockerfile
similarity index 98%
copy from eclipse-temurin_17-alpine/Dockerfile
copy to eclipse-temurin_17-alpine-3.20/Dockerfile
index 65d63d8..7a9e298 100644
--- a/eclipse-temurin_17-alpine/Dockerfile
+++ b/eclipse-temurin_17-alpine-3.20/Dockerfile
@@ -70,7 +70,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_11-alpine/entrypoint.sh b/eclipse-temurin_17-alpine-3.20/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_11-alpine/entrypoint.sh
copy to eclipse-temurin_17-alpine-3.20/entrypoint.sh
diff --git a/eclipse-temurin_17-alpine/Dockerfile b/eclipse-temurin_17-alpine/Dockerfile
index 65d63d8..dbe0baf 100644
--- a/eclipse-temurin_17-alpine/Dockerfile
+++ b/eclipse-temurin_17-alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 ENV JAVA_HOME=/opt/java/openjdk
 ENV PATH=$JAVA_HOME/bin:$PATH
@@ -70,7 +70,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_17-focal/Dockerfile b/eclipse-temurin_17-focal/Dockerfile
index 03b53ec..267f294 100644
--- a/eclipse-temurin_17-focal/Dockerfile
+++ b/eclipse-temurin_17-focal/Dockerfile
@@ -87,7 +87,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_17-jammy/Dockerfile b/eclipse-temurin_17-jammy/Dockerfile
index 15b9f5f..89d08c1 100644
--- a/eclipse-temurin_17-jammy/Dockerfile
+++ b/eclipse-temurin_17-jammy/Dockerfile
@@ -87,7 +87,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_17-jre-alpine/Dockerfile b/eclipse-temurin_17-jre-alpine-3.20/Dockerfile
similarity index 96%
copy from eclipse-temurin_17-jre-alpine/Dockerfile
copy to eclipse-temurin_17-jre-alpine-3.20/Dockerfile
index 465b093..1bac845 100644
--- a/eclipse-temurin_17-jre-alpine/Dockerfile
+++ b/eclipse-temurin_17-jre-alpine-3.20/Dockerfile
@@ -67,7 +67,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -76,7 +76,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_11-alpine/entrypoint.sh b/eclipse-temurin_17-jre-alpine-3.20/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_11-alpine/entrypoint.sh
copy to eclipse-temurin_17-jre-alpine-3.20/entrypoint.sh
diff --git a/eclipse-temurin_17-jre-alpine/Dockerfile b/eclipse-temurin_17-jre-alpine/Dockerfile
index 465b093..953b8ad 100644
--- a/eclipse-temurin_17-jre-alpine/Dockerfile
+++ b/eclipse-temurin_17-jre-alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 ENV JAVA_HOME=/opt/java/openjdk
 ENV PATH=$JAVA_HOME/bin:$PATH
@@ -67,7 +67,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -76,7 +76,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_17-jre-focal/Dockerfile b/eclipse-temurin_17-jre-focal/Dockerfile
index 322ce77..5061fde 100644
--- a/eclipse-temurin_17-jre-focal/Dockerfile
+++ b/eclipse-temurin_17-jre-focal/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -93,7 +93,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig; \
diff --git a/eclipse-temurin_17-jre-jammy/Dockerfile b/eclipse-temurin_17-jre-jammy/Dockerfile
index 0055dfc..34d807a 100644
--- a/eclipse-temurin_17-jre-jammy/Dockerfile
+++ b/eclipse-temurin_17-jre-jammy/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -93,7 +93,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig; \
diff --git a/eclipse-temurin_17-jre-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_17-jre-nanoserver-ltsc2025/Dockerfile
similarity index 94%
copy from eclipse-temurin_17-jre-nanoserver-ltsc2022/Dockerfile
copy to eclipse-temurin_17-jre-nanoserver-ltsc2025/Dockerfile
index 102abe2..f7318e3 100644
--- a/eclipse-temurin_17-jre-nanoserver-ltsc2022/Dockerfile
+++ b/eclipse-temurin_17-jre-nanoserver-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -31,7 +31,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
     && echo Complete.
 USER ContainerUser
 
-COPY --from=eclipse-temurin:17.0.13_11-jre-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:17.0.13_11-jre-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo java --version && java --version \
diff --git a/eclipse-temurin_17-jre-noble/Dockerfile b/eclipse-temurin_17-jre-noble/Dockerfile
index 977cf0b..8ec93c8 100644
--- a/eclipse-temurin_17-jre-noble/Dockerfile
+++ b/eclipse-temurin_17-jre-noble/Dockerfile
@@ -88,7 +88,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -97,7 +97,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig; \
diff --git a/eclipse-temurin_17-jre-ubi9-minimal/Dockerfile b/eclipse-temurin_17-jre-ubi9-minimal/Dockerfile
index bb9e350..f14023b 100644
--- a/eclipse-temurin_17-jre-ubi9-minimal/Dockerfile
+++ b/eclipse-temurin_17-jre-ubi9-minimal/Dockerfile
@@ -76,7 +76,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -85,7 +85,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_17-jre-windowsservercore-1809/Dockerfile b/eclipse-temurin_17-jre-windowsservercore-ltsc2025/Dockerfile
similarity index 97%
copy from eclipse-temurin_17-jre-windowsservercore-1809/Dockerfile
copy to eclipse-temurin_17-jre-windowsservercore-ltsc2025/Dockerfile
index 5ca447a..ca91aca 100644
--- a/eclipse-temurin_17-jre-windowsservercore-1809/Dockerfile
+++ b/eclipse-temurin_17-jre-windowsservercore-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/eclipse-temurin_17-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_17-nanoserver-ltsc2025/Dockerfile
similarity index 94%
copy from eclipse-temurin_17-nanoserver-ltsc2022/Dockerfile
copy to eclipse-temurin_17-nanoserver-ltsc2025/Dockerfile
index c2ff935..94cc728 100644
--- a/eclipse-temurin_17-nanoserver-ltsc2022/Dockerfile
+++ b/eclipse-temurin_17-nanoserver-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -31,7 +31,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
     && echo Complete.
 USER ContainerUser
 
-COPY --from=eclipse-temurin:17.0.13_11-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:17.0.13_11-jdk-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo javac --version && javac --version \
diff --git a/eclipse-temurin_17-noble/Dockerfile b/eclipse-temurin_17-noble/Dockerfile
index 5fe2313..2fed4b6 100644
--- a/eclipse-temurin_17-noble/Dockerfile
+++ b/eclipse-temurin_17-noble/Dockerfile
@@ -91,7 +91,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_17-ubi9-minimal/Dockerfile b/eclipse-temurin_17-ubi9-minimal/Dockerfile
index e0c33d7..b311929 100644
--- a/eclipse-temurin_17-ubi9-minimal/Dockerfile
+++ b/eclipse-temurin_17-ubi9-minimal/Dockerfile
@@ -76,7 +76,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_17-windowsservercore-1809/Dockerfile b/eclipse-temurin_17-windowsservercore-ltsc2025/Dockerfile
similarity index 98%
copy from eclipse-temurin_17-windowsservercore-1809/Dockerfile
copy to eclipse-temurin_17-windowsservercore-ltsc2025/Dockerfile
index 2ac6e0e..3e8352e 100644
--- a/eclipse-temurin_17-windowsservercore-1809/Dockerfile
+++ b/eclipse-temurin_17-windowsservercore-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/eclipse-temurin_21-alpine/Dockerfile b/eclipse-temurin_21-alpine-3.20/Dockerfile
similarity index 98%
copy from eclipse-temurin_21-alpine/Dockerfile
copy to eclipse-temurin_21-alpine-3.20/Dockerfile
index e27b487..6ed9151 100644
--- a/eclipse-temurin_21-alpine/Dockerfile
+++ b/eclipse-temurin_21-alpine-3.20/Dockerfile
@@ -74,7 +74,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_11-alpine/entrypoint.sh b/eclipse-temurin_21-alpine-3.20/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_11-alpine/entrypoint.sh
copy to eclipse-temurin_21-alpine-3.20/entrypoint.sh
diff --git a/eclipse-temurin_21-alpine/Dockerfile b/eclipse-temurin_21-alpine/Dockerfile
index e27b487..079d169 100644
--- a/eclipse-temurin_21-alpine/Dockerfile
+++ b/eclipse-temurin_21-alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 ENV JAVA_HOME=/opt/java/openjdk
 ENV PATH=$JAVA_HOME/bin:$PATH
@@ -74,7 +74,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_21-jammy/Dockerfile b/eclipse-temurin_21-jammy/Dockerfile
index fa497f8..36cd2fd 100644
--- a/eclipse-temurin_21-jammy/Dockerfile
+++ b/eclipse-temurin_21-jammy/Dockerfile
@@ -83,7 +83,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_21-jre-alpine/Dockerfile b/eclipse-temurin_21-jre-alpine-3.20/Dockerfile
similarity index 97%
copy from eclipse-temurin_21-jre-alpine/Dockerfile
copy to eclipse-temurin_21-jre-alpine-3.20/Dockerfile
index 9763d29..23d97ce 100644
--- a/eclipse-temurin_21-jre-alpine/Dockerfile
+++ b/eclipse-temurin_21-jre-alpine-3.20/Dockerfile
@@ -71,7 +71,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -80,7 +80,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_11-alpine/entrypoint.sh b/eclipse-temurin_21-jre-alpine-3.20/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_11-alpine/entrypoint.sh
copy to eclipse-temurin_21-jre-alpine-3.20/entrypoint.sh
diff --git a/eclipse-temurin_21-jre-alpine/Dockerfile b/eclipse-temurin_21-jre-alpine/Dockerfile
index 9763d29..43da8b5 100644
--- a/eclipse-temurin_21-jre-alpine/Dockerfile
+++ b/eclipse-temurin_21-jre-alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 ENV JAVA_HOME=/opt/java/openjdk
 ENV PATH=$JAVA_HOME/bin:$PATH
@@ -71,7 +71,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -80,7 +80,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_21-jre-jammy/Dockerfile b/eclipse-temurin_21-jre-jammy/Dockerfile
index cf01dd5..9a43b14 100644
--- a/eclipse-temurin_21-jre-jammy/Dockerfile
+++ b/eclipse-temurin_21-jre-jammy/Dockerfile
@@ -80,7 +80,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -89,7 +89,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig; \
diff --git a/eclipse-temurin_21-jre-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_21-jre-nanoserver-ltsc2025/Dockerfile
similarity index 94%
copy from eclipse-temurin_21-jre-nanoserver-ltsc2022/Dockerfile
copy to eclipse-temurin_21-jre-nanoserver-ltsc2025/Dockerfile
index 759b795..daf9902 100644
--- a/eclipse-temurin_21-jre-nanoserver-ltsc2022/Dockerfile
+++ b/eclipse-temurin_21-jre-nanoserver-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -31,7 +31,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
     && echo Complete.
 USER ContainerUser
 
-COPY --from=eclipse-temurin:21.0.5_11-jre-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:21.0.5_11-jre-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo java --version && java --version \
diff --git a/eclipse-temurin_21-jre-noble/Dockerfile b/eclipse-temurin_21-jre-noble/Dockerfile
index b01e421..b1c7963 100644
--- a/eclipse-temurin_21-jre-noble/Dockerfile
+++ b/eclipse-temurin_21-jre-noble/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -93,7 +93,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig; \
diff --git a/eclipse-temurin_21-jre-ubi9-minimal/Dockerfile b/eclipse-temurin_21-jre-ubi9-minimal/Dockerfile
index 01068de..a64d706 100644
--- a/eclipse-temurin_21-jre-ubi9-minimal/Dockerfile
+++ b/eclipse-temurin_21-jre-ubi9-minimal/Dockerfile
@@ -76,7 +76,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -85,7 +85,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_21-jre-windowsservercore-1809/Dockerfile b/eclipse-temurin_21-jre-windowsservercore-ltsc2025/Dockerfile
similarity index 97%
copy from eclipse-temurin_21-jre-windowsservercore-1809/Dockerfile
copy to eclipse-temurin_21-jre-windowsservercore-ltsc2025/Dockerfile
index eef7844..e9f3efb 100644
--- a/eclipse-temurin_21-jre-windowsservercore-1809/Dockerfile
+++ b/eclipse-temurin_21-jre-windowsservercore-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/eclipse-temurin_21-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_21-nanoserver-ltsc2025/Dockerfile
similarity index 94%
copy from eclipse-temurin_21-nanoserver-ltsc2022/Dockerfile
copy to eclipse-temurin_21-nanoserver-ltsc2025/Dockerfile
index 5dcb77a..403d213 100644
--- a/eclipse-temurin_21-nanoserver-ltsc2022/Dockerfile
+++ b/eclipse-temurin_21-nanoserver-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -31,7 +31,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
     && echo Complete.
 USER ContainerUser
 
-COPY --from=eclipse-temurin:21.0.5_11-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:21.0.5_11-jdk-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo javac --version && javac --version \
diff --git a/eclipse-temurin_21-noble/Dockerfile b/eclipse-temurin_21-noble/Dockerfile
index 67ca232..4ffab9a 100644
--- a/eclipse-temurin_21-noble/Dockerfile
+++ b/eclipse-temurin_21-noble/Dockerfile
@@ -87,7 +87,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_21-ubi9-minimal/Dockerfile b/eclipse-temurin_21-ubi9-minimal/Dockerfile
index 4514ca0..9920d74 100644
--- a/eclipse-temurin_21-ubi9-minimal/Dockerfile
+++ b/eclipse-temurin_21-ubi9-minimal/Dockerfile
@@ -76,7 +76,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_21-windowsservercore-1809/Dockerfile b/eclipse-temurin_21-windowsservercore-ltsc2025/Dockerfile
similarity index 98%
copy from eclipse-temurin_21-windowsservercore-1809/Dockerfile
copy to eclipse-temurin_21-windowsservercore-ltsc2025/Dockerfile
index efc04d1..126df21 100644
--- a/eclipse-temurin_21-windowsservercore-1809/Dockerfile
+++ b/eclipse-temurin_21-windowsservercore-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/eclipse-temurin_23-alpine/Dockerfile b/eclipse-temurin_23-alpine-3.20/Dockerfile
similarity index 98%
copy from eclipse-temurin_23-alpine/Dockerfile
copy to eclipse-temurin_23-alpine-3.20/Dockerfile
index 1ad6dba..07a96e8 100644
--- a/eclipse-temurin_23-alpine/Dockerfile
+++ b/eclipse-temurin_23-alpine-3.20/Dockerfile
@@ -74,7 +74,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_11-alpine/entrypoint.sh b/eclipse-temurin_23-alpine-3.20/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_11-alpine/entrypoint.sh
copy to eclipse-temurin_23-alpine-3.20/entrypoint.sh
diff --git a/eclipse-temurin_23-alpine/Dockerfile b/eclipse-temurin_23-alpine/Dockerfile
index 1ad6dba..b853ea5 100644
--- a/eclipse-temurin_23-alpine/Dockerfile
+++ b/eclipse-temurin_23-alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 ENV JAVA_HOME=/opt/java/openjdk
 ENV PATH=$JAVA_HOME/bin:$PATH
@@ -74,7 +74,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_23-jre-alpine/Dockerfile b/eclipse-temurin_23-jre-alpine-3.20/Dockerfile
similarity index 97%
copy from eclipse-temurin_23-jre-alpine/Dockerfile
copy to eclipse-temurin_23-jre-alpine-3.20/Dockerfile
index dd7efa2..b23acf8 100644
--- a/eclipse-temurin_23-jre-alpine/Dockerfile
+++ b/eclipse-temurin_23-jre-alpine-3.20/Dockerfile
@@ -71,7 +71,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -80,7 +80,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_11-alpine/entrypoint.sh b/eclipse-temurin_23-jre-alpine-3.20/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_11-alpine/entrypoint.sh
copy to eclipse-temurin_23-jre-alpine-3.20/entrypoint.sh
diff --git a/eclipse-temurin_23-jre-alpine/Dockerfile b/eclipse-temurin_23-jre-alpine/Dockerfile
index dd7efa2..a1f1e23 100644
--- a/eclipse-temurin_23-jre-alpine/Dockerfile
+++ b/eclipse-temurin_23-jre-alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 ENV JAVA_HOME=/opt/java/openjdk
 ENV PATH=$JAVA_HOME/bin:$PATH
@@ -71,7 +71,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -80,7 +80,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_23-jre-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_23-jre-nanoserver-ltsc2025/Dockerfile
similarity index 94%
copy from eclipse-temurin_23-jre-nanoserver-ltsc2022/Dockerfile
copy to eclipse-temurin_23-jre-nanoserver-ltsc2025/Dockerfile
index 58c0dfa..ba1f423 100644
--- a/eclipse-temurin_23-jre-nanoserver-ltsc2022/Dockerfile
+++ b/eclipse-temurin_23-jre-nanoserver-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -31,7 +31,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
     && echo Complete.
 USER ContainerUser
 
-COPY --from=eclipse-temurin:23.0.1_11-jre-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:23.0.1_11-jre-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo java --version && java --version \
diff --git a/eclipse-temurin_23-jre-noble/Dockerfile b/eclipse-temurin_23-jre-noble/Dockerfile
index 8560b8a..317166b 100644
--- a/eclipse-temurin_23-jre-noble/Dockerfile
+++ b/eclipse-temurin_23-jre-noble/Dockerfile
@@ -82,7 +82,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -91,7 +91,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig; \
diff --git a/eclipse-temurin_23-jre-ubi9-minimal/Dockerfile b/eclipse-temurin_23-jre-ubi9-minimal/Dockerfile
index 6db93a6..8a43d8c 100644
--- a/eclipse-temurin_23-jre-ubi9-minimal/Dockerfile
+++ b/eclipse-temurin_23-jre-ubi9-minimal/Dockerfile
@@ -76,7 +76,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -85,7 +85,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_23-jre-windowsservercore-ltsc2022/Dockerfile b/eclipse-temurin_23-jre-windowsservercore-ltsc2025/Dockerfile
similarity index 97%
copy from eclipse-temurin_23-jre-windowsservercore-ltsc2022/Dockerfile
copy to eclipse-temurin_23-jre-windowsservercore-ltsc2025/Dockerfile
index 9bc4675..63ab43e 100644
--- a/eclipse-temurin_23-jre-windowsservercore-ltsc2022/Dockerfile
+++ b/eclipse-temurin_23-jre-windowsservercore-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2022
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/eclipse-temurin_23-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_23-nanoserver-ltsc2025/Dockerfile
similarity index 94%
copy from eclipse-temurin_23-nanoserver-ltsc2022/Dockerfile
copy to eclipse-temurin_23-nanoserver-ltsc2025/Dockerfile
index f16fecd..0174e24 100644
--- a/eclipse-temurin_23-nanoserver-ltsc2022/Dockerfile
+++ b/eclipse-temurin_23-nanoserver-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -31,7 +31,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
     && echo Complete.
 USER ContainerUser
 
-COPY --from=eclipse-temurin:23.0.1_11-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:23.0.1_11-jdk-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo javac --version && javac --version \
diff --git a/eclipse-temurin_23-noble/Dockerfile b/eclipse-temurin_23-noble/Dockerfile
index 22a24fb..3cff8d2 100644
--- a/eclipse-temurin_23-noble/Dockerfile
+++ b/eclipse-temurin_23-noble/Dockerfile
@@ -85,7 +85,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_23-ubi9-minimal/Dockerfile b/eclipse-temurin_23-ubi9-minimal/Dockerfile
index 0dbdee7..efa91da 100644
--- a/eclipse-temurin_23-ubi9-minimal/Dockerfile
+++ b/eclipse-temurin_23-ubi9-minimal/Dockerfile
@@ -76,7 +76,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
diff --git a/eclipse-temurin_23-windowsservercore-1809/Dockerfile b/eclipse-temurin_23-windowsservercore-ltsc2025/Dockerfile
similarity index 98%
copy from eclipse-temurin_23-windowsservercore-1809/Dockerfile
copy to eclipse-temurin_23-windowsservercore-ltsc2025/Dockerfile
index f6ca57d..5d27936 100644
--- a/eclipse-temurin_23-windowsservercore-1809/Dockerfile
+++ b/eclipse-temurin_23-windowsservercore-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/eclipse-temurin_8-alpine/Dockerfile b/eclipse-temurin_8-alpine-3.20/Dockerfile
similarity index 97%
copy from eclipse-temurin_8-alpine/Dockerfile
copy to eclipse-temurin_8-alpine-3.20/Dockerfile
index c9212d0..4647cfd 100644
--- a/eclipse-temurin_8-alpine/Dockerfile
+++ b/eclipse-temurin_8-alpine-3.20/Dockerfile
@@ -67,7 +67,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -76,7 +76,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_8-alpine/entrypoint.sh b/eclipse-temurin_8-alpine-3.20/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_8-alpine/entrypoint.sh
copy to eclipse-temurin_8-alpine-3.20/entrypoint.sh
diff --git a/eclipse-temurin_8-alpine/Dockerfile b/eclipse-temurin_8-alpine/Dockerfile
index c9212d0..83ecc7e 100644
--- a/eclipse-temurin_8-alpine/Dockerfile
+++ b/eclipse-temurin_8-alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 ENV JAVA_HOME=/opt/java/openjdk
 ENV PATH=$JAVA_HOME/bin:$PATH
@@ -67,7 +67,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -76,7 +76,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_8-focal/Dockerfile b/eclipse-temurin_8-focal/Dockerfile
index 3cb62c4..31f32ca 100644
--- a/eclipse-temurin_8-focal/Dockerfile
+++ b/eclipse-temurin_8-focal/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -93,7 +93,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig;
diff --git a/eclipse-temurin_8-jammy/Dockerfile b/eclipse-temurin_8-jammy/Dockerfile
index 523b962..ea963cd 100644
--- a/eclipse-temurin_8-jammy/Dockerfile
+++ b/eclipse-temurin_8-jammy/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -93,7 +93,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig;
diff --git a/eclipse-temurin_8-jre-alpine/Dockerfile b/eclipse-temurin_8-jre-alpine-3.20/Dockerfile
similarity index 96%
copy from eclipse-temurin_8-jre-alpine/Dockerfile
copy to eclipse-temurin_8-jre-alpine-3.20/Dockerfile
index 8b84faf..8429eec 100644
--- a/eclipse-temurin_8-jre-alpine/Dockerfile
+++ b/eclipse-temurin_8-jre-alpine-3.20/Dockerfile
@@ -67,7 +67,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -76,7 +76,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_11-alpine/entrypoint.sh b/eclipse-temurin_8-jre-alpine-3.20/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_11-alpine/entrypoint.sh
copy to eclipse-temurin_8-jre-alpine-3.20/entrypoint.sh
diff --git a/eclipse-temurin_8-jre-alpine/Dockerfile b/eclipse-temurin_8-jre-alpine/Dockerfile
index 8b84faf..80ba7fa 100644
--- a/eclipse-temurin_8-jre-alpine/Dockerfile
+++ b/eclipse-temurin_8-jre-alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 ENV JAVA_HOME=/opt/java/openjdk
 ENV PATH=$JAVA_HOME/bin:$PATH
@@ -67,7 +67,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -76,7 +76,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_8-jre-focal/Dockerfile b/eclipse-temurin_8-jre-focal/Dockerfile
index 1217017..aa21887 100644
--- a/eclipse-temurin_8-jre-focal/Dockerfile
+++ b/eclipse-temurin_8-jre-focal/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -93,7 +93,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig;
diff --git a/eclipse-temurin_8-jre-jammy/Dockerfile b/eclipse-temurin_8-jre-jammy/Dockerfile
index f4511fc..9491a9b 100644
--- a/eclipse-temurin_8-jre-jammy/Dockerfile
+++ b/eclipse-temurin_8-jre-jammy/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -93,7 +93,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig;
diff --git a/eclipse-temurin_8-jre-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_8-jre-nanoserver-ltsc2025/Dockerfile
similarity index 94%
copy from eclipse-temurin_8-jre-nanoserver-ltsc2022/Dockerfile
copy to eclipse-temurin_8-jre-nanoserver-ltsc2025/Dockerfile
index 82fae8d..801e94b 100644
--- a/eclipse-temurin_8-jre-nanoserver-ltsc2022/Dockerfile
+++ b/eclipse-temurin_8-jre-nanoserver-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -31,7 +31,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
     && echo Complete.
 USER ContainerUser
 
-COPY --from=eclipse-temurin:8u432-b06-jre-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:8u432-b06-jre-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo java -version && java -version \
diff --git a/eclipse-temurin_8-jre-noble/Dockerfile b/eclipse-temurin_8-jre-noble/Dockerfile
index 749c34f..867e24a 100644
--- a/eclipse-temurin_8-jre-noble/Dockerfile
+++ b/eclipse-temurin_8-jre-noble/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -93,7 +93,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig;
diff --git a/eclipse-temurin_8-jre-ubi9-minimal/Dockerfile b/eclipse-temurin_8-jre-ubi9-minimal/Dockerfile
index a3c49cc..edc636d 100644
--- a/eclipse-temurin_8-jre-ubi9-minimal/Dockerfile
+++ b/eclipse-temurin_8-jre-ubi9-minimal/Dockerfile
@@ -72,7 +72,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -81,7 +81,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_8-jre-windowsservercore-ltsc2022/Dockerfile b/eclipse-temurin_8-jre-windowsservercore-ltsc2025/Dockerfile
similarity index 97%
copy from eclipse-temurin_8-jre-windowsservercore-ltsc2022/Dockerfile
copy to eclipse-temurin_8-jre-windowsservercore-ltsc2025/Dockerfile
index 2576cc1..31e293c 100644
--- a/eclipse-temurin_8-jre-windowsservercore-ltsc2022/Dockerfile
+++ b/eclipse-temurin_8-jre-windowsservercore-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2022
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/eclipse-temurin_8-nanoserver-ltsc2022/Dockerfile b/eclipse-temurin_8-nanoserver-ltsc2025/Dockerfile
similarity index 94%
copy from eclipse-temurin_8-nanoserver-ltsc2022/Dockerfile
copy to eclipse-temurin_8-nanoserver-ltsc2025/Dockerfile
index ab8a503..0f40aa9 100644
--- a/eclipse-temurin_8-nanoserver-ltsc2022/Dockerfile
+++ b/eclipse-temurin_8-nanoserver-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -31,7 +31,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
     && echo Complete.
 USER ContainerUser
 
-COPY --from=eclipse-temurin:8u432-b06-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:8u432-b06-jdk-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo javac -version && javac -version \
diff --git a/eclipse-temurin_8-noble/Dockerfile b/eclipse-temurin_8-noble/Dockerfile
index be69abe..2c40706 100644
--- a/eclipse-temurin_8-noble/Dockerfile
+++ b/eclipse-temurin_8-noble/Dockerfile
@@ -84,7 +84,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -93,7 +93,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \
+    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip; \
     # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
     find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig;
diff --git a/eclipse-temurin_8-ubi9-minimal/Dockerfile b/eclipse-temurin_8-ubi9-minimal/Dockerfile
index 10b02bc..a2f271c 100644
--- a/eclipse-temurin_8-ubi9-minimal/Dockerfile
+++ b/eclipse-temurin_8-ubi9-minimal/Dockerfile
@@ -72,7 +72,7 @@ RUN set -eux; \
     # gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
     gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
-    rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
+    rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
     mkdir -p "$JAVA_HOME"; \
     tar --extract \
@@ -81,7 +81,7 @@ RUN set -eux; \
         --strip-components 1 \
         --no-same-owner \
     ; \
-    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
+    rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/src.zip;
 
 RUN set -eux; \
     echo "Verifying install ..."; \
diff --git a/eclipse-temurin_8-windowsservercore-1809/Dockerfile b/eclipse-temurin_8-windowsservercore-ltsc2025/Dockerfile
similarity index 98%
copy from eclipse-temurin_8-windowsservercore-1809/Dockerfile
copy to eclipse-temurin_8-windowsservercore-ltsc2025/Dockerfile
index 3c781bc..bb92ef5 100644
--- a/eclipse-temurin_8-windowsservercore-1809/Dockerfile
+++ b/eclipse-temurin_8-windowsservercore-ltsc2025/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Relevant Maintainers:

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

@yosifkit yosifkit yosifkit left review comments

At least 0 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
library/eclipse-temurin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gdams @yosifkit