maven: JDK 23

[carlossg]

No description provided.

[github-actions]

Diff for 8f1cd05:

diff --git a/_bashbrew-arches b/_bashbrew-arches
index 044c900..8ccd6e8 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -2,4 +2,5 @@ amd64
 arm32v7
 arm64v8
 ppc64le
+riscv64
 s390x
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 63dd518..3c41676 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -5,172 +5,217 @@ Builder: buildkit
 
 Tags: 3.9.9-amazoncorretto-8, 3.9-amazoncorretto-8, 3-amazoncorretto-8
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: amazoncorretto-8
 
 Tags: 3.9.9-amazoncorretto-8-al2023, 3.9-amazoncorretto-8-al2023, 3-amazoncorretto-8-al2023
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: amazoncorretto-8-al2023
 
+Tags: 3.9.9-amazoncorretto-8-alpine, 3.9-amazoncorretto-8-alpine, 3-amazoncorretto-8-alpine
+Architectures: amd64, arm64v8
+GitCommit: 8db2ffe029454a39edce973ce06b21fcab59a4d5
+Directory: amazoncorretto-8-alpine
+
 Tags: 3.9.9-amazoncorretto-8-debian, 3.9.9-amazoncorretto-8-debian-bookworm, 3.9-amazoncorretto-8-debian, 3.9-amazoncorretto-8-debian-bookworm, 3-amazoncorretto-8-debian, 3-amazoncorretto-8-debian-bookworm
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: amazoncorretto-8-debian
 
-Tags: 3.9.9-amazoncorretto-11, 3.9.9-amazoncorretto, 3.9-amazoncorretto-11, 3.9-amazoncorretto, 3-amazoncorretto-11, 3-amazoncorretto, amazoncorretto
+Tags: 3.9.9-amazoncorretto-11, 3.9-amazoncorretto-11, 3-amazoncorretto-11
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: amazoncorretto-11
 
 Tags: 3.9.9-amazoncorretto-11-al2023, 3.9-amazoncorretto-11-al2023, 3-amazoncorretto-11-al2023
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: amazoncorretto-11-al2023
 
+Tags: 3.9.9-amazoncorretto-11-alpine, 3.9-amazoncorretto-11-alpine, 3-amazoncorretto-11-alpine
+Architectures: amd64, arm64v8
+GitCommit: 8db2ffe029454a39edce973ce06b21fcab59a4d5
+Directory: amazoncorretto-11-alpine
+
 Tags: 3.9.9-amazoncorretto-11-debian, 3.9.9-amazoncorretto-11-debian-bookworm, 3.9-amazoncorretto-11-debian, 3.9-amazoncorretto-11-debian-bookworm, 3-amazoncorretto-11-debian, 3-amazoncorretto-11-debian-bookworm
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: amazoncorretto-11-debian
 
-Tags: 3.9.9-amazoncorretto-17, 3.9-amazoncorretto-17, 3-amazoncorretto-17
+Tags: 3.9.9-amazoncorretto-17, 3.9.9-amazoncorretto, 3.9-amazoncorretto-17, 3.9-amazoncorretto, 3-amazoncorretto-17, 3-amazoncorretto, amazoncorretto
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: amazoncorretto-17
 
 Tags: 3.9.9-amazoncorretto-17-al2023, 3.9-amazoncorretto-17-al2023, 3-amazoncorretto-17-al2023
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: amazoncorretto-17-al2023
 
+Tags: 3.9.9-amazoncorretto-17-alpine, 3.9-amazoncorretto-17-alpine, 3-amazoncorretto-17-alpine
+Architectures: amd64, arm64v8
+GitCommit: 8db2ffe029454a39edce973ce06b21fcab59a4d5
+Directory: amazoncorretto-17-alpine
+
 Tags: 3.9.9-amazoncorretto-17-debian, 3.9.9-amazoncorretto-17-debian-bookworm, 3.9-amazoncorretto-17-debian, 3.9-amazoncorretto-17-debian-bookworm, 3-amazoncorretto-17-debian, 3-amazoncorretto-17-debian-bookworm
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: amazoncorretto-17-debian
 
 Tags: 3.9.9-amazoncorretto-21, 3.9-amazoncorretto-21, 3-amazoncorretto-21
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: amazoncorretto-21
 
 Tags: 3.9.9-amazoncorretto-21-al2023, 3.9-amazoncorretto-21-al2023, 3-amazoncorretto-21-al2023
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: amazoncorretto-21-al2023
 
+Tags: 3.9.9-amazoncorretto-21-alpine, 3.9-amazoncorretto-21-alpine, 3-amazoncorretto-21-alpine
+Architectures: amd64, arm64v8
+GitCommit: 8db2ffe029454a39edce973ce06b21fcab59a4d5
+Directory: amazoncorretto-21-alpine
+
 Tags: 3.9.9-amazoncorretto-21-debian, 3.9.9-amazoncorretto-21-debian-bookworm, 3.9-amazoncorretto-21-debian, 3.9-amazoncorretto-21-debian-bookworm, 3-amazoncorretto-21-debian, 3-amazoncorretto-21-debian-bookworm
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: amazoncorretto-21-debian
 
+Tags: 3.9.9-amazoncorretto-23, 3.9-amazoncorretto-23, 3-amazoncorretto-23
+Architectures: amd64, arm64v8
+GitCommit: c4359a51cb0fe7bc7e552f3e039a0e77947bbffc
+Directory: amazoncorretto-23
+
+Tags: 3.9.9-amazoncorretto-23-al2023, 3.9-amazoncorretto-23-al2023, 3-amazoncorretto-23-al2023
+Architectures: amd64, arm64v8
+GitCommit: 1a9e1b5643b9d895484f8cd841e01262a174f14b
+Directory: amazoncorretto-23-al2023
+
+Tags: 3.9.9-amazoncorretto-23-alpine, 3.9-amazoncorretto-23-alpine, 3-amazoncorretto-23-alpine
+Architectures: amd64, arm64v8
+GitCommit: 8db2ffe029454a39edce973ce06b21fcab59a4d5
+Directory: amazoncorretto-23-alpine
+
+Tags: 3.9.9-amazoncorretto-23-debian, 3.9.9-amazoncorretto-23-debian-bookworm, 3.9-amazoncorretto-23-debian, 3.9-amazoncorretto-23-debian-bookworm, 3-amazoncorretto-23-debian, 3-amazoncorretto-23-debian-bookworm
+Architectures: amd64, arm64v8
+GitCommit: c4359a51cb0fe7bc7e552f3e039a0e77947bbffc
+Directory: amazoncorretto-23-debian
+
 Tags: 3.9.9-eclipse-temurin-8, 3.9-eclipse-temurin-8, 3-eclipse-temurin-8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: eclipse-temurin-8
 
 Tags: 3.9.9-eclipse-temurin-8-alpine, 3.9-eclipse-temurin-8-alpine, 3-eclipse-temurin-8-alpine
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: eclipse-temurin-8-alpine
 
 Tags: 3.9.9-eclipse-temurin-8-focal, 3.9-eclipse-temurin-8-focal, 3-eclipse-temurin-8-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: eclipse-temurin-8-focal
 
 Tags: 3.9.9-eclipse-temurin-11, 3.9-eclipse-temurin-11, 3-eclipse-temurin-11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: eclipse-temurin-11
 
 Tags: 3.9.9-eclipse-temurin-11-alpine, 3.9-eclipse-temurin-11-alpine, 3-eclipse-temurin-11-alpine
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: eclipse-temurin-11-alpine
 
 Tags: 3.9.9-eclipse-temurin-11-focal, 3.9-eclipse-temurin-11-focal, 3-eclipse-temurin-11-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: eclipse-temurin-11-focal
 
 Tags: 3.9.9-eclipse-temurin-17, 3.9-eclipse-temurin-17, 3-eclipse-temurin-17
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: eclipse-temurin-17
 
 Tags: 3.9.9-eclipse-temurin-17-alpine, 3.9-eclipse-temurin-17-alpine, 3-eclipse-temurin-17-alpine
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: eclipse-temurin-17-alpine
 
 Tags: 3.9.9-eclipse-temurin-17-focal, 3.9-eclipse-temurin-17-focal, 3-eclipse-temurin-17-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: eclipse-temurin-17-focal
 
 Tags: 3.9.9-eclipse-temurin-21, 3.9.9, 3.9.9-eclipse-temurin, 3.9-eclipse-temurin-21, 3.9, 3.9-eclipse-temurin, 3-eclipse-temurin-21, 3, latest, 3-eclipse-temurin, eclipse-temurin
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: eclipse-temurin-21
 
 Tags: 3.9.9-eclipse-temurin-21-alpine, 3.9-eclipse-temurin-21-alpine, 3-eclipse-temurin-21-alpine
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: eclipse-temurin-21-alpine
 
 Tags: 3.9.9-eclipse-temurin-21-jammy, 3.9-eclipse-temurin-21-jammy, 3-eclipse-temurin-21-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: eclipse-temurin-21-jammy
 
-Tags: 3.9.9-eclipse-temurin-22, 3.9-eclipse-temurin-22, 3-eclipse-temurin-22
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
-Directory: eclipse-temurin-22
+Tags: 3.9.9-eclipse-temurin-23, 3.9-eclipse-temurin-23, 3-eclipse-temurin-23
+Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
+GitCommit: c4359a51cb0fe7bc7e552f3e039a0e77947bbffc
+Directory: eclipse-temurin-23
 
-Tags: 3.9.9-eclipse-temurin-22-alpine, 3.9-eclipse-temurin-22-alpine, 3-eclipse-temurin-22-alpine
+Tags: 3.9.9-eclipse-temurin-23-alpine, 3.9-eclipse-temurin-23-alpine, 3-eclipse-temurin-23-alpine
 Architectures: amd64, arm64v8
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
-Directory: eclipse-temurin-22-alpine
+GitCommit: c4359a51cb0fe7bc7e552f3e039a0e77947bbffc
+Directory: eclipse-temurin-23-alpine
 
-Tags: 3.9.9-eclipse-temurin-22-jammy, 3.9-eclipse-temurin-22-jammy, 3-eclipse-temurin-22-jammy
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
-Directory: eclipse-temurin-22-jammy
+Tags: 3.9.9-eclipse-temurin-23-noble, 3.9-eclipse-temurin-23-noble, 3-eclipse-temurin-23-noble
+Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
+GitCommit: c4359a51cb0fe7bc7e552f3e039a0e77947bbffc
+Directory: eclipse-temurin-23-noble
 
 Tags: 3.9.9-ibmjava-8, 3.9.9-ibmjava, 3.9-ibmjava-8, 3.9-ibmjava, 3-ibmjava-8, 3-ibmjava, ibmjava
 Architectures: amd64, ppc64le, s390x
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: ibmjava-8
 
 Tags: 3.9.9-ibm-semeru-11-focal, 3.9-ibm-semeru-11-focal, 3-ibm-semeru-11-focal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: ibm-semeru-11-focal
 
 Tags: 3.9.9-ibm-semeru-17-focal, 3.9-ibm-semeru-17-focal, 3-ibm-semeru-17-focal
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: ibm-semeru-17-focal
 
 Tags: 3.9.9-ibm-semeru-21-jammy, 3.9-ibm-semeru-21-jammy, 3-ibm-semeru-21-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: ibm-semeru-21-jammy
 
+Tags: 3.9.9-ibm-semeru-23-jammy, 3.9-ibm-semeru-23-jammy, 3-ibm-semeru-23-jammy
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: c4359a51cb0fe7bc7e552f3e039a0e77947bbffc
+Directory: ibm-semeru-23-jammy
+
 Tags: 3.9.9-sapmachine-11, 3.9-sapmachine-11, 3-sapmachine-11
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: sapmachine-11
 
 Tags: 3.9.9-sapmachine-17, 3.9-sapmachine-17, 3-sapmachine-17
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: sapmachine-17
 
 Tags: 3.9.9-sapmachine-21, 3.9.9-sapmachine, 3.9-sapmachine-21, 3.9-sapmachine, 3-sapmachine-21, 3-sapmachine, sapmachine
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
+GitCommit: 8cfe24baffa5b250f7bb2d31ce233fc28f3c4f20
 Directory: sapmachine-21
 
-Tags: 3.9.9-sapmachine-22, 3.9-sapmachine-22, 3-sapmachine-22
+Tags: 3.9.9-sapmachine-23, 3.9-sapmachine-23, 3-sapmachine-23
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 49e8a5ef575ba09b1d9096f6292ef480e07124d6
-Directory: sapmachine-22
+GitCommit: c4359a51cb0fe7bc7e552f3e039a0e77947bbffc
+Directory: sapmachine-23
diff --git a/_bashbrew-list b/_bashbrew-list
index c152cb9..dffb495 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,20 +2,29 @@ maven:3
 maven:3-amazoncorretto
 maven:3-amazoncorretto-8
 maven:3-amazoncorretto-8-al2023
+maven:3-amazoncorretto-8-alpine
 maven:3-amazoncorretto-8-debian
 maven:3-amazoncorretto-8-debian-bookworm
 maven:3-amazoncorretto-11
 maven:3-amazoncorretto-11-al2023
+maven:3-amazoncorretto-11-alpine
 maven:3-amazoncorretto-11-debian
 maven:3-amazoncorretto-11-debian-bookworm
 maven:3-amazoncorretto-17
 maven:3-amazoncorretto-17-al2023
+maven:3-amazoncorretto-17-alpine
 maven:3-amazoncorretto-17-debian
 maven:3-amazoncorretto-17-debian-bookworm
 maven:3-amazoncorretto-21
 maven:3-amazoncorretto-21-al2023
+maven:3-amazoncorretto-21-alpine
 maven:3-amazoncorretto-21-debian
 maven:3-amazoncorretto-21-debian-bookworm
+maven:3-amazoncorretto-23
+maven:3-amazoncorretto-23-al2023
+maven:3-amazoncorretto-23-alpine
+maven:3-amazoncorretto-23-debian
+maven:3-amazoncorretto-23-debian-bookworm
 maven:3-eclipse-temurin
 maven:3-eclipse-temurin-8
 maven:3-eclipse-temurin-8-alpine
@@ -29,37 +38,47 @@ maven:3-eclipse-temurin-17-focal
 maven:3-eclipse-temurin-21
 maven:3-eclipse-temurin-21-alpine
 maven:3-eclipse-temurin-21-jammy
-maven:3-eclipse-temurin-22
-maven:3-eclipse-temurin-22-alpine
-maven:3-eclipse-temurin-22-jammy
+maven:3-eclipse-temurin-23
+maven:3-eclipse-temurin-23-alpine
+maven:3-eclipse-temurin-23-noble
 maven:3-ibmjava
 maven:3-ibmjava-8
 maven:3-ibm-semeru-11-focal
 maven:3-ibm-semeru-17-focal
 maven:3-ibm-semeru-21-jammy
+maven:3-ibm-semeru-23-jammy
 maven:3-sapmachine
 maven:3-sapmachine-11
 maven:3-sapmachine-17
 maven:3-sapmachine-21
-maven:3-sapmachine-22
+maven:3-sapmachine-23
 maven:3.9
 maven:3.9-amazoncorretto
 maven:3.9-amazoncorretto-8
 maven:3.9-amazoncorretto-8-al2023
+maven:3.9-amazoncorretto-8-alpine
 maven:3.9-amazoncorretto-8-debian
 maven:3.9-amazoncorretto-8-debian-bookworm
 maven:3.9-amazoncorretto-11
 maven:3.9-amazoncorretto-11-al2023
+maven:3.9-amazoncorretto-11-alpine
 maven:3.9-amazoncorretto-11-debian
 maven:3.9-amazoncorretto-11-debian-bookworm
 maven:3.9-amazoncorretto-17
 maven:3.9-amazoncorretto-17-al2023
+maven:3.9-amazoncorretto-17-alpine
 maven:3.9-amazoncorretto-17-debian
 maven:3.9-amazoncorretto-17-debian-bookworm
 maven:3.9-amazoncorretto-21
 maven:3.9-amazoncorretto-21-al2023
+maven:3.9-amazoncorretto-21-alpine
 maven:3.9-amazoncorretto-21-debian
 maven:3.9-amazoncorretto-21-debian-bookworm
+maven:3.9-amazoncorretto-23
+maven:3.9-amazoncorretto-23-al2023
+maven:3.9-amazoncorretto-23-alpine
+maven:3.9-amazoncorretto-23-debian
+maven:3.9-amazoncorretto-23-debian-bookworm
 maven:3.9-eclipse-temurin
 maven:3.9-eclipse-temurin-8
 maven:3.9-eclipse-temurin-8-alpine
@@ -73,37 +92,47 @@ maven:3.9-eclipse-temurin-17-focal
 maven:3.9-eclipse-temurin-21
 maven:3.9-eclipse-temurin-21-alpine
 maven:3.9-eclipse-temurin-21-jammy
-maven:3.9-eclipse-temurin-22
-maven:3.9-eclipse-temurin-22-alpine
-maven:3.9-eclipse-temurin-22-jammy
+maven:3.9-eclipse-temurin-23
+maven:3.9-eclipse-temurin-23-alpine
+maven:3.9-eclipse-temurin-23-noble
 maven:3.9-ibmjava
 maven:3.9-ibmjava-8
 maven:3.9-ibm-semeru-11-focal
 maven:3.9-ibm-semeru-17-focal
 maven:3.9-ibm-semeru-21-jammy
+maven:3.9-ibm-semeru-23-jammy
 maven:3.9-sapmachine
 maven:3.9-sapmachine-11
 maven:3.9-sapmachine-17
 maven:3.9-sapmachine-21
-maven:3.9-sapmachine-22
+maven:3.9-sapmachine-23
 maven:3.9.9
 maven:3.9.9-amazoncorretto
 maven:3.9.9-amazoncorretto-8
 maven:3.9.9-amazoncorretto-8-al2023
+maven:3.9.9-amazoncorretto-8-alpine
 maven:3.9.9-amazoncorretto-8-debian
 maven:3.9.9-amazoncorretto-8-debian-bookworm
 maven:3.9.9-amazoncorretto-11
 maven:3.9.9-amazoncorretto-11-al2023
+maven:3.9.9-amazoncorretto-11-alpine
 maven:3.9.9-amazoncorretto-11-debian
 maven:3.9.9-amazoncorretto-11-debian-bookworm
 maven:3.9.9-amazoncorretto-17
 maven:3.9.9-amazoncorretto-17-al2023
+maven:3.9.9-amazoncorretto-17-alpine
 maven:3.9.9-amazoncorretto-17-debian
 maven:3.9.9-amazoncorretto-17-debian-bookworm
 maven:3.9.9-amazoncorretto-21
 maven:3.9.9-amazoncorretto-21-al2023
+maven:3.9.9-amazoncorretto-21-alpine
 maven:3.9.9-amazoncorretto-21-debian
 maven:3.9.9-amazoncorretto-21-debian-bookworm
+maven:3.9.9-amazoncorretto-23
+maven:3.9.9-amazoncorretto-23-al2023
+maven:3.9.9-amazoncorretto-23-alpine
+maven:3.9.9-amazoncorretto-23-debian
+maven:3.9.9-amazoncorretto-23-debian-bookworm
 maven:3.9.9-eclipse-temurin
 maven:3.9.9-eclipse-temurin-8
 maven:3.9.9-eclipse-temurin-8-alpine
@@ -117,19 +146,20 @@ maven:3.9.9-eclipse-temurin-17-focal
 maven:3.9.9-eclipse-temurin-21
 maven:3.9.9-eclipse-temurin-21-alpine
 maven:3.9.9-eclipse-temurin-21-jammy
-maven:3.9.9-eclipse-temurin-22
-maven:3.9.9-eclipse-temurin-22-alpine
-maven:3.9.9-eclipse-temurin-22-jammy
+maven:3.9.9-eclipse-temurin-23
+maven:3.9.9-eclipse-temurin-23-alpine
+maven:3.9.9-eclipse-temurin-23-noble
 maven:3.9.9-ibmjava
 maven:3.9.9-ibmjava-8
 maven:3.9.9-ibm-semeru-11-focal
 maven:3.9.9-ibm-semeru-17-focal
 maven:3.9.9-ibm-semeru-21-jammy
+maven:3.9.9-ibm-semeru-23-jammy
 maven:3.9.9-sapmachine
 maven:3.9.9-sapmachine-11
 maven:3.9.9-sapmachine-17
 maven:3.9.9-sapmachine-21
-maven:3.9.9-sapmachine-22
+maven:3.9.9-sapmachine-23
 maven:amazoncorretto
 maven:eclipse-temurin
 maven:ibmjava
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 942f66a..86a4913 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,35 +1,44 @@
-maven:3-eclipse-temurin-11
-maven:3-eclipse-temurin-11-alpine
-maven:3-eclipse-temurin-11-focal
 maven:3-eclipse-temurin-17
 maven:3-eclipse-temurin-17-alpine
 maven:3-eclipse-temurin-17-focal
 maven:3-eclipse-temurin-21-alpine
 maven:3-eclipse-temurin-21-jammy
-maven:3-eclipse-temurin-22
-maven:3-eclipse-temurin-22-alpine
-maven:3-eclipse-temurin-22-jammy
+maven:3-eclipse-temurin-23
+maven:3-eclipse-temurin-23-alpine
+maven:3-eclipse-temurin-23-noble
 maven:3-ibm-semeru-11-focal
 maven:3-ibm-semeru-17-focal
 maven:3-ibm-semeru-21-jammy
+maven:3-ibm-semeru-23-jammy
 maven:3-sapmachine-11
 maven:3-sapmachine-17
-maven:3-sapmachine-22
+maven:3-sapmachine-23
 maven:amazoncorretto
 maven:eclipse-temurin
 maven:ibmjava
 maven:sapmachine
 maven:3-amazoncorretto-8
 maven:3-amazoncorretto-8-al2023
+maven:3-amazoncorretto-8-alpine
 maven:3-amazoncorretto-8-debian-bookworm
+maven:3-amazoncorretto-11
 maven:3-amazoncorretto-11-al2023
+maven:3-amazoncorretto-11-alpine
 maven:3-amazoncorretto-11-debian-bookworm
-maven:3-amazoncorretto-17
 maven:3-amazoncorretto-17-al2023
+maven:3-amazoncorretto-17-alpine
 maven:3-amazoncorretto-17-debian-bookworm
 maven:3-amazoncorretto-21
 maven:3-amazoncorretto-21-al2023
+maven:3-amazoncorretto-21-alpine
 maven:3-amazoncorretto-21-debian-bookworm
+maven:3-amazoncorretto-23
+maven:3-amazoncorretto-23-al2023
+maven:3-amazoncorretto-23-alpine
+maven:3-amazoncorretto-23-debian-bookworm
 maven:3-eclipse-temurin-8
 maven:3-eclipse-temurin-8-alpine
 maven:3-eclipse-temurin-8-focal
+maven:3-eclipse-temurin-11
+maven:3-eclipse-temurin-11-alpine
+maven:3-eclipse-temurin-11-focal
diff --git a/maven_3-amazoncorretto-11-al2023/Dockerfile b/maven_3-amazoncorretto-11-al2023/Dockerfile
index 011b407..462e036 100644
--- a/maven_3-amazoncorretto-11-al2023/Dockerfile
+++ b/maven_3-amazoncorretto-11-al2023/Dockerfile
@@ -11,9 +11,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-8-alpine/Dockerfile b/maven_3-amazoncorretto-11-alpine/Dockerfile
similarity index 74%
copy from maven_3-eclipse-temurin-8-alpine/Dockerfile
copy to maven_3-amazoncorretto-11-alpine/Dockerfile
index 770e945..41b6244 100644
--- a/maven_3-eclipse-temurin-8-alpine/Dockerfile
+++ b/maven_3-amazoncorretto-11-alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM eclipse-temurin:8-jdk-alpine
+FROM amazoncorretto:11-alpine
 
-RUN apk add --no-cache bash procps curl tar openssh-client
+RUN apk add --no-cache bash openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title="Apache Maven"
@@ -10,9 +10,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-amazoncorretto-11-debian-bookworm/Dockerfile b/maven_3-amazoncorretto-11-debian-bookworm/Dockerfile
index a747d8f..5e11c6e 100644
--- a/maven_3-amazoncorretto-11-debian-bookworm/Dockerfile
+++ b/maven_3-amazoncorretto-11-debian-bookworm/Dockerfile
@@ -27,9 +27,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-amazoncorretto-17/Dockerfile b/maven_3-amazoncorretto-11/Dockerfile
similarity index 81%
rename from maven_3-amazoncorretto-17/Dockerfile
rename to maven_3-amazoncorretto-11/Dockerfile
index 3dcaeea..7e3d865 100644
--- a/maven_3-amazoncorretto-17/Dockerfile
+++ b/maven_3-amazoncorretto-11/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:17
+FROM amazoncorretto:11
 
 RUN yum install -y tar which gzip # TODO remove
 RUN yum install -y openssh-clients
@@ -11,9 +11,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-amazoncorretto-17-al2023/Dockerfile b/maven_3-amazoncorretto-17-al2023/Dockerfile
index 7e39a77..4e943e3 100644
--- a/maven_3-amazoncorretto-17-al2023/Dockerfile
+++ b/maven_3-amazoncorretto-17-al2023/Dockerfile
@@ -11,9 +11,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-8-alpine/Dockerfile b/maven_3-amazoncorretto-17-alpine/Dockerfile
similarity index 74%
copy from maven_3-eclipse-temurin-8-alpine/Dockerfile
copy to maven_3-amazoncorretto-17-alpine/Dockerfile
index 770e945..12aa2f4 100644
--- a/maven_3-eclipse-temurin-8-alpine/Dockerfile
+++ b/maven_3-amazoncorretto-17-alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM eclipse-temurin:8-jdk-alpine
+FROM amazoncorretto:17-alpine
 
-RUN apk add --no-cache bash procps curl tar openssh-client
+RUN apk add --no-cache bash openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title="Apache Maven"
@@ -10,9 +10,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-amazoncorretto-17-debian-bookworm/Dockerfile b/maven_3-amazoncorretto-17-debian-bookworm/Dockerfile
index 0ac87c0..7803911 100644
--- a/maven_3-amazoncorretto-17-debian-bookworm/Dockerfile
+++ b/maven_3-amazoncorretto-17-debian-bookworm/Dockerfile
@@ -27,9 +27,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-amazoncorretto-21-al2023/Dockerfile b/maven_3-amazoncorretto-21-al2023/Dockerfile
index 27329a0..05da983 100644
--- a/maven_3-amazoncorretto-21-al2023/Dockerfile
+++ b/maven_3-amazoncorretto-21-al2023/Dockerfile
@@ -11,9 +11,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-8-alpine/Dockerfile b/maven_3-amazoncorretto-21-alpine/Dockerfile
similarity index 74%
copy from maven_3-eclipse-temurin-8-alpine/Dockerfile
copy to maven_3-amazoncorretto-21-alpine/Dockerfile
index 770e945..f4abc81 100644
--- a/maven_3-eclipse-temurin-8-alpine/Dockerfile
+++ b/maven_3-amazoncorretto-21-alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM eclipse-temurin:8-jdk-alpine
+FROM amazoncorretto:21-alpine
 
-RUN apk add --no-cache bash procps curl tar openssh-client
+RUN apk add --no-cache bash openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title="Apache Maven"
@@ -10,9 +10,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-amazoncorretto-21-debian-bookworm/Dockerfile b/maven_3-amazoncorretto-21-debian-bookworm/Dockerfile
index 3e26ffa..2fe3ae4 100644
--- a/maven_3-amazoncorretto-21-debian-bookworm/Dockerfile
+++ b/maven_3-amazoncorretto-21-debian-bookworm/Dockerfile
@@ -27,9 +27,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-amazoncorretto-21/Dockerfile b/maven_3-amazoncorretto-21/Dockerfile
index a44ee71..f830a2a 100644
--- a/maven_3-amazoncorretto-21/Dockerfile
+++ b/maven_3-amazoncorretto-21/Dockerfile
@@ -11,9 +11,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-8-alpine/Dockerfile b/maven_3-amazoncorretto-23-al2023/Dockerfile
similarity index 74%
copy from maven_3-eclipse-temurin-8-alpine/Dockerfile
copy to maven_3-amazoncorretto-23-al2023/Dockerfile
index 770e945..b58d597 100644
--- a/maven_3-eclipse-temurin-8-alpine/Dockerfile
+++ b/maven_3-amazoncorretto-23-al2023/Dockerfile
@@ -1,6 +1,6 @@
-FROM eclipse-temurin:8-jdk-alpine
+FROM amazoncorretto:23-al2023
 
-RUN apk add --no-cache bash procps curl tar openssh-client
+RUN yum install -y openssh-clients findutils
 
 # common for all images
 LABEL org.opencontainers.image.title="Apache Maven"
@@ -10,9 +10,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-8-alpine/Dockerfile b/maven_3-amazoncorretto-23-alpine/Dockerfile
similarity index 74%
copy from maven_3-eclipse-temurin-8-alpine/Dockerfile
copy to maven_3-amazoncorretto-23-alpine/Dockerfile
index 770e945..5a8a133 100644
--- a/maven_3-eclipse-temurin-8-alpine/Dockerfile
+++ b/maven_3-amazoncorretto-23-alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM eclipse-temurin:8-jdk-alpine
+FROM amazoncorretto:23-alpine
 
-RUN apk add --no-cache bash procps curl tar openssh-client
+RUN apk add --no-cache bash openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title="Apache Maven"
@@ -10,9 +10,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-amazoncorretto-21-debian-bookworm/Dockerfile b/maven_3-amazoncorretto-23-debian-bookworm/Dockerfile
similarity index 85%
copy from maven_3-amazoncorretto-21-debian-bookworm/Dockerfile
copy to maven_3-amazoncorretto-23-debian-bookworm/Dockerfile
index 3e26ffa..88fa823 100644
--- a/maven_3-amazoncorretto-21-debian-bookworm/Dockerfile
+++ b/maven_3-amazoncorretto-23-debian-bookworm/Dockerfile
@@ -13,11 +13,11 @@ RUN apt-get update \
   && echo "deb [signed-by=/usr/share/keyrings/corretto.gpg] https://apt.corretto.aws stable main" > /etc/apt/sources.list.d/corretto.list \
   && apt-get update \
   && apt-get remove --purge --autoremove -y curl gnupg \
-  && apt-get install -y java-21-amazon-corretto-jdk \
+  && apt-get install -y java-23-amazon-corretto-jdk \
   && rm -rf /var/lib/apt/lists/*
 
 # set JAVA_HOME manually since nothing else will set it
-ENV JAVA_HOME="/usr/lib/jvm/java-21-amazon-corretto"
+ENV JAVA_HOME="/usr/lib/jvm/java-23-amazon-corretto"
 
 # common for all images
 LABEL org.opencontainers.image.title="Apache Maven"
@@ -27,9 +27,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-8-alpine/Dockerfile b/maven_3-amazoncorretto-23/Dockerfile
similarity index 74%
copy from maven_3-eclipse-temurin-8-alpine/Dockerfile
copy to maven_3-amazoncorretto-23/Dockerfile
index 770e945..eb45ea1 100644
--- a/maven_3-eclipse-temurin-8-alpine/Dockerfile
+++ b/maven_3-amazoncorretto-23/Dockerfile
@@ -1,6 +1,6 @@
-FROM eclipse-temurin:8-jdk-alpine
+FROM amazoncorretto:23
 
-RUN apk add --no-cache bash procps curl tar openssh-client
+RUN yum install -y openssh-clients findutils
 
 # common for all images
 LABEL org.opencontainers.image.title="Apache Maven"
@@ -10,9 +10,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-amazoncorretto-8-al2023/Dockerfile b/maven_3-amazoncorretto-8-al2023/Dockerfile
index 4ec91f6..b707334 100644
--- a/maven_3-amazoncorretto-8-al2023/Dockerfile
+++ b/maven_3-amazoncorretto-8-al2023/Dockerfile
@@ -11,9 +11,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-8-alpine/Dockerfile b/maven_3-amazoncorretto-8-alpine/Dockerfile
similarity index 74%
copy from maven_3-eclipse-temurin-8-alpine/Dockerfile
copy to maven_3-amazoncorretto-8-alpine/Dockerfile
index 770e945..186d4af 100644
--- a/maven_3-eclipse-temurin-8-alpine/Dockerfile
+++ b/maven_3-amazoncorretto-8-alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM eclipse-temurin:8-jdk-alpine
+FROM amazoncorretto:8-alpine
 
-RUN apk add --no-cache bash procps curl tar openssh-client
+RUN apk add --no-cache bash openssh-client
 
 # common for all images
 LABEL org.opencontainers.image.title="Apache Maven"
@@ -10,9 +10,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-amazoncorretto-8-debian-bookworm/Dockerfile b/maven_3-amazoncorretto-8-debian-bookworm/Dockerfile
index 86c3690..f4d46b2 100644
--- a/maven_3-amazoncorretto-8-debian-bookworm/Dockerfile
+++ b/maven_3-amazoncorretto-8-debian-bookworm/Dockerfile
@@ -27,9 +27,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-amazoncorretto-8/Dockerfile b/maven_3-amazoncorretto-8/Dockerfile
index d7bdba1..04ebeb1 100644
--- a/maven_3-amazoncorretto-8/Dockerfile
+++ b/maven_3-amazoncorretto-8/Dockerfile
@@ -11,9 +11,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-11-alpine/Dockerfile b/maven_3-eclipse-temurin-11-alpine/Dockerfile
index 1df98d5..08ec991 100644
--- a/maven_3-eclipse-temurin-11-alpine/Dockerfile
+++ b/maven_3-eclipse-temurin-11-alpine/Dockerfile
@@ -10,9 +10,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-11-focal/Dockerfile b/maven_3-eclipse-temurin-11-focal/Dockerfile
index 9edefa4..a413fbc 100644
--- a/maven_3-eclipse-temurin-11-focal/Dockerfile
+++ b/maven_3-eclipse-temurin-11-focal/Dockerfile
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-11/Dockerfile b/maven_3-eclipse-temurin-11/Dockerfile
index 7bc581a..cfd3bb8 100644
--- a/maven_3-eclipse-temurin-11/Dockerfile
+++ b/maven_3-eclipse-temurin-11/Dockerfile
@@ -1,41 +1,10 @@
-FROM eclipse-temurin:11-jdk as builder
-
-ARG MAVEN_VERSION=3.9.9
-ARG USER_HOME_DIR="/root"
-ARG SHA=a555254d6b53d267965a3404ecb14e53c3827c09c3b94b5678835887ab404556bfaf78dcfe03ba76fa2508649dca8531c74bca4d5846513522404d48e8c4ac8b
-ARG BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
-
-ENV MAVEN_HOME=/usr/share/maven
-ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
-
-RUN apt-get update \
-  && apt-get install -y ca-certificates curl git gnupg dirmngr --no-install-recommends \
-  && rm -rf /var/lib/apt/lists/*
-RUN set -eux; curl -fsSLO --compressed ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
-  && echo "${SHA} *apache-maven-${MAVEN_VERSION}-bin.tar.gz" | sha512sum -c - \
-  && curl -fsSLO --compressed ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc \
-  && export GNUPGHOME="$(mktemp -d)"; \
-  for key in \
-  6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688 \
-  29BEA2A645F2D6CED7FB12E02B172E3E156466E8 \
-  88BE34F94BDB2B5357044E2E3A387D43964143E3 \
-  ; do \
-  gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \
-  done; \
-  gpg --batch --verify apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc apache-maven-${MAVEN_VERSION}-bin.tar.gz
-RUN mkdir -p ${MAVEN_HOME} ${MAVEN_HOME}/ref \
-  && tar -xzf apache-maven-${MAVEN_VERSION}-bin.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
-  && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
-# smoke test
-RUN mvn --version
-
-
 FROM eclipse-temurin:11-jdk
 
 RUN apt-get update \
   && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
+# common for all images
 LABEL org.opencontainers.image.title="Apache Maven"
 LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven
 LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven
@@ -43,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=builder ${MAVEN_HOME} ${MAVEN_HOME}
-COPY mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY settings-docker.xml /usr/share/maven/ref/
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-17-alpine/Dockerfile b/maven_3-eclipse-temurin-17-alpine/Dockerfile
index 9e2e17d..75cd95c 100644
--- a/maven_3-eclipse-temurin-17-alpine/Dockerfile
+++ b/maven_3-eclipse-temurin-17-alpine/Dockerfile
@@ -10,9 +10,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-17-focal/Dockerfile b/maven_3-eclipse-temurin-17-focal/Dockerfile
index 2c73be7..2cc2727 100644
--- a/maven_3-eclipse-temurin-17-focal/Dockerfile
+++ b/maven_3-eclipse-temurin-17-focal/Dockerfile
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-17/Dockerfile b/maven_3-eclipse-temurin-17/Dockerfile
index 38c2cb1..7c4ab75 100644
--- a/maven_3-eclipse-temurin-17/Dockerfile
+++ b/maven_3-eclipse-temurin-17/Dockerfile
@@ -1,10 +1,41 @@
+FROM eclipse-temurin:17-jdk as builder
+
+ARG MAVEN_VERSION=3.9.9
+ARG USER_HOME_DIR="/root"
+ARG SHA=a555254d6b53d267965a3404ecb14e53c3827c09c3b94b5678835887ab404556bfaf78dcfe03ba76fa2508649dca8531c74bca4d5846513522404d48e8c4ac8b
+ARG BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+ENV MAVEN_HOME=/usr/share/maven
+ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
+
+RUN apt-get update \
+  && apt-get install -y ca-certificates curl git gnupg dirmngr --no-install-recommends \
+  && rm -rf /var/lib/apt/lists/*
+RUN set -eux; curl -fsSLO --compressed ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+  && echo "${SHA} *apache-maven-${MAVEN_VERSION}-bin.tar.gz" | sha512sum -c - \
+  && curl -fsSLO --compressed ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc \
+  && export GNUPGHOME="$(mktemp -d)"; \
+  for key in \
+  6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688 \
+  29BEA2A645F2D6CED7FB12E02B172E3E156466E8 \
+  88BE34F94BDB2B5357044E2E3A387D43964143E3 \
+  ; do \
+  gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \
+  done; \
+  gpg --batch --verify apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc apache-maven-${MAVEN_VERSION}-bin.tar.gz
+RUN mkdir -p ${MAVEN_HOME} ${MAVEN_HOME}/ref \
+  && tar -xzf apache-maven-${MAVEN_VERSION}-bin.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
+  && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
+# smoke test
+RUN mvn --version
+
+
 FROM eclipse-temurin:17-jdk
 
 RUN apt-get update \
   && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
-# common for all images
 LABEL org.opencontainers.image.title="Apache Maven"
 LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven
 LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven
@@ -12,9 +43,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=builder ${MAVEN_HOME} ${MAVEN_HOME}
+COPY mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY settings-docker.xml /usr/share/maven/ref/
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-11/mvn-entrypoint.sh b/maven_3-eclipse-temurin-17/mvn-entrypoint.sh
similarity index 100%
rename from maven_3-eclipse-temurin-11/mvn-entrypoint.sh
rename to maven_3-eclipse-temurin-17/mvn-entrypoint.sh
diff --git a/maven_3-eclipse-temurin-11/settings-docker.xml b/maven_3-eclipse-temurin-17/settings-docker.xml
similarity index 100%
rename from maven_3-eclipse-temurin-11/settings-docker.xml
rename to maven_3-eclipse-temurin-17/settings-docker.xml
diff --git a/maven_3-eclipse-temurin-21-alpine/Dockerfile b/maven_3-eclipse-temurin-21-alpine/Dockerfile
index d6b31bd..3244356 100644
--- a/maven_3-eclipse-temurin-21-alpine/Dockerfile
+++ b/maven_3-eclipse-temurin-21-alpine/Dockerfile
@@ -10,9 +10,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-21-jammy/Dockerfile b/maven_3-eclipse-temurin-21-jammy/Dockerfile
index aaf2263..56aa119 100644
--- a/maven_3-eclipse-temurin-21-jammy/Dockerfile
+++ b/maven_3-eclipse-temurin-21-jammy/Dockerfile
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-22-jammy/Dockerfile b/maven_3-eclipse-temurin-22-jammy/Dockerfile
deleted file mode 100644
index 8fccf5a..0000000
diff --git a/maven_3-eclipse-temurin-22-alpine/Dockerfile b/maven_3-eclipse-temurin-23-alpine/Dockerfile
similarity index 79%
rename from maven_3-eclipse-temurin-22-alpine/Dockerfile
rename to maven_3-eclipse-temurin-23-alpine/Dockerfile
index 6935ee6..f86585a 100644
--- a/maven_3-eclipse-temurin-22-alpine/Dockerfile
+++ b/maven_3-eclipse-temurin-23-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:22-jdk-alpine
+FROM eclipse-temurin:23-jdk-alpine
 
 RUN apk add --no-cache bash procps curl tar openssh-client
 
@@ -10,9 +10,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-11-focal/Dockerfile b/maven_3-eclipse-temurin-23-noble/Dockerfile
similarity index 81%
copy from maven_3-eclipse-temurin-11-focal/Dockerfile
copy to maven_3-eclipse-temurin-23-noble/Dockerfile
index 9edefa4..9f0c4bf 100644
--- a/maven_3-eclipse-temurin-11-focal/Dockerfile
+++ b/maven_3-eclipse-temurin-23-noble/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11-jdk-focal
+FROM eclipse-temurin:23-jdk-noble
 
 RUN apt-get update \
   && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-22/Dockerfile b/maven_3-eclipse-temurin-23/Dockerfile
similarity index 81%
rename from maven_3-eclipse-temurin-22/Dockerfile
rename to maven_3-eclipse-temurin-23/Dockerfile
index 687b970..575ce94 100644
--- a/maven_3-eclipse-temurin-22/Dockerfile
+++ b/maven_3-eclipse-temurin-23/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:22-jdk
+FROM eclipse-temurin:23-jdk
 
 RUN apt-get update \
   && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-8-alpine/Dockerfile b/maven_3-eclipse-temurin-8-alpine/Dockerfile
index 770e945..27e9930 100644
--- a/maven_3-eclipse-temurin-8-alpine/Dockerfile
+++ b/maven_3-eclipse-temurin-8-alpine/Dockerfile
@@ -10,9 +10,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-8-focal/Dockerfile b/maven_3-eclipse-temurin-8-focal/Dockerfile
index 31b67ea..92d2d4e 100644
--- a/maven_3-eclipse-temurin-8-focal/Dockerfile
+++ b/maven_3-eclipse-temurin-8-focal/Dockerfile
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-eclipse-temurin-8/Dockerfile b/maven_3-eclipse-temurin-8/Dockerfile
index 13c89eb..48daa82 100644
--- a/maven_3-eclipse-temurin-8/Dockerfile
+++ b/maven_3-eclipse-temurin-8/Dockerfile
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-ibm-semeru-11-focal/Dockerfile b/maven_3-ibm-semeru-11-focal/Dockerfile
index 452b393..fa69aee 100644
--- a/maven_3-ibm-semeru-11-focal/Dockerfile
+++ b/maven_3-ibm-semeru-11-focal/Dockerfile
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-ibm-semeru-17-focal/Dockerfile b/maven_3-ibm-semeru-17-focal/Dockerfile
index e52d323..7271877 100644
--- a/maven_3-ibm-semeru-17-focal/Dockerfile
+++ b/maven_3-ibm-semeru-17-focal/Dockerfile
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-ibm-semeru-21-jammy/Dockerfile b/maven_3-ibm-semeru-21-jammy/Dockerfile
index aa9a4a4..a1f7360 100644
--- a/maven_3-ibm-semeru-21-jammy/Dockerfile
+++ b/maven_3-ibm-semeru-21-jammy/Dockerfile
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-ibm-semeru-11-focal/Dockerfile b/maven_3-ibm-semeru-23-jammy/Dockerfile
similarity index 80%
copy from maven_3-ibm-semeru-11-focal/Dockerfile
copy to maven_3-ibm-semeru-23-jammy/Dockerfile
index 452b393..2a3e946 100644
--- a/maven_3-ibm-semeru-11-focal/Dockerfile
+++ b/maven_3-ibm-semeru-23-jammy/Dockerfile
@@ -1,4 +1,4 @@
-FROM ibm-semeru-runtimes:open-11-jdk-focal
+FROM ibm-semeru-runtimes:open-23-jdk-jammy
 
 RUN apt-get update \
   && apt-get install -y git openssh-client --no-install-recommends \
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-sapmachine-11/Dockerfile b/maven_3-sapmachine-11/Dockerfile
index e798605..14c3e2d 100644
--- a/maven_3-sapmachine-11/Dockerfile
+++ b/maven_3-sapmachine-11/Dockerfile
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-sapmachine-17/Dockerfile b/maven_3-sapmachine-17/Dockerfile
index c40fec9..c7a76da 100644
--- a/maven_3-sapmachine-17/Dockerfile
+++ b/maven_3-sapmachine-17/Dockerfile
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_3-sapmachine-22/Dockerfile b/maven_3-sapmachine-23/Dockerfile
similarity index 82%
rename from maven_3-sapmachine-22/Dockerfile
rename to maven_3-sapmachine-23/Dockerfile
index 99c3c7f..9904ed1 100644
--- a/maven_3-sapmachine-22/Dockerfile
+++ b/maven_3-sapmachine-23/Dockerfile
@@ -1,4 +1,4 @@
-FROM sapmachine:22
+FROM sapmachine:23
 
 RUN apt-get update \
   && apt-get install -y ca-certificates curl git openssh-client --no-install-recommends \
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_amazoncorretto/Dockerfile b/maven_amazoncorretto/Dockerfile
index 15cfbc4..c53034d 100644
--- a/maven_amazoncorretto/Dockerfile
+++ b/maven_amazoncorretto/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:11
+FROM amazoncorretto:17
 
 RUN yum install -y tar which gzip # TODO remove
 RUN yum install -y openssh-clients
@@ -11,9 +11,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_eclipse-temurin/Dockerfile b/maven_eclipse-temurin/Dockerfile
index 6fc7789..7dfa43a 100644
--- a/maven_eclipse-temurin/Dockerfile
+++ b/maven_eclipse-temurin/Dockerfile
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_ibmjava/Dockerfile b/maven_ibmjava/Dockerfile
index d230d52..d57d9ba 100644
--- a/maven_ibmjava/Dockerfile
+++ b/maven_ibmjava/Dockerfile
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
diff --git a/maven_sapmachine/Dockerfile b/maven_sapmachine/Dockerfile
index 0baeb58..11b77f8 100644
--- a/maven_sapmachine/Dockerfile
+++ b/maven_sapmachine/Dockerfile
@@ -12,9 +12,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:3.9.9-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:3.9.9-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn

Relevant Maintainers:

• maven: @carlossg

[patpatpat123]

Thank you Carlos for this

[tianon]

Not a blocker, and I plan to merge in a moment in spite of it (because it'll be a trivial follow-up if it's an issue), but this discrepancy in the list of packages installed between these different Alpine variants is expected/intentional, right?

-FROM eclipse-temurin:8-jdk-alpine
+FROM amazoncorretto:17-alpine
 
-RUN apk add --no-cache bash procps curl tar openssh-client
+RUN apk add --no-cache bash openssh-client