From 17ae8adc47feed00f9a0c35487514f55b2b0f65d Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Sat, 26 Oct 2024 21:56:56 +0200
Subject: [PATCH 1/2] chore: build maven 4 images from ghcr repo

---
 Dockerfile-template-maven-4                    | 6 +++---
 amazoncorretto-17-al2023-maven-4/Dockerfile    | 6 +++---
 amazoncorretto-17-debian-maven-4/Dockerfile    | 6 +++---
 amazoncorretto-17-maven-4/Dockerfile           | 6 +++---
 amazoncorretto-21-al2023-maven-4/Dockerfile    | 6 +++---
 amazoncorretto-21-debian-maven-4/Dockerfile    | 6 +++---
 amazoncorretto-21-maven-4/Dockerfile           | 6 +++---
 amazoncorretto-23-al2023-maven-4/Dockerfile    | 6 +++---
 amazoncorretto-23-debian-maven-4/Dockerfile    | 6 +++---
 amazoncorretto-23-maven-4/Dockerfile           | 6 +++---
 azulzulu-17-alpine-maven-4/Dockerfile          | 6 +++---
 azulzulu-17-maven-4/Dockerfile                 | 6 +++---
 azulzulu-21-alpine-maven-4/Dockerfile          | 6 +++---
 azulzulu-21-maven-4/Dockerfile                 | 6 +++---
 azulzulu-23-alpine-maven-4/Dockerfile          | 6 +++---
 azulzulu-23-maven-4/Dockerfile                 | 6 +++---
 eclipse-temurin-17-alpine-maven-4/Dockerfile   | 6 +++---
 eclipse-temurin-17-focal-maven-4/Dockerfile    | 6 +++---
 eclipse-temurin-21-alpine-maven-4/Dockerfile   | 6 +++---
 eclipse-temurin-21-jammy-maven-4/Dockerfile    | 6 +++---
 eclipse-temurin-21-maven-4/Dockerfile          | 6 +++---
 eclipse-temurin-23-alpine-maven-4/Dockerfile   | 6 +++---
 eclipse-temurin-23-maven-4/Dockerfile          | 6 +++---
 eclipse-temurin-23-noble-maven-4/Dockerfile    | 6 +++---
 graalvm-community-17-maven-4/Dockerfile        | 6 +++---
 graalvm-community-21-maven-4/Dockerfile        | 6 +++---
 graalvm-community-23-maven-4/Dockerfile        | 6 +++---
 ibm-semeru-17-focal-maven-4/Dockerfile         | 6 +++---
 ibm-semeru-21-jammy-maven-4/Dockerfile         | 6 +++---
 ibm-semeru-23-jammy-maven-4/Dockerfile         | 6 +++---
 libericaopenjdk-17-alpine-maven-4/Dockerfile   | 6 +++---
 libericaopenjdk-17-debian-maven-4/Dockerfile   | 6 +++---
 microsoft-openjdk-17-ubuntu-maven-4/Dockerfile | 6 +++---
 microsoft-openjdk-21-ubuntu-maven-4/Dockerfile | 6 +++---
 oracle-graalvm-17-maven-4/Dockerfile           | 6 +++---
 oracle-graalvm-21-maven-4/Dockerfile           | 6 +++---
 oracle-graalvm-23-maven-4/Dockerfile           | 6 +++---
 sapmachine-17-maven-4/Dockerfile               | 6 +++---
 sapmachine-21-maven-4/Dockerfile               | 6 +++---
 sapmachine-22-maven-4/Dockerfile               | 6 +++---
 sapmachine-23-maven-4/Dockerfile               | 6 +++---
 41 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/Dockerfile-template-maven-4 b/Dockerfile-template-maven-4
index cb8998cd..722b14ff 100644
--- a/Dockerfile-template-maven-4
+++ b/Dockerfile-template-maven-4
@@ -6,9 +6,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/amazoncorretto-17-al2023-maven-4/Dockerfile b/amazoncorretto-17-al2023-maven-4/Dockerfile
index 399b0769..1e35c5b0 100644
--- a/amazoncorretto-17-al2023-maven-4/Dockerfile
+++ b/amazoncorretto-17-al2023-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/amazoncorretto-17-debian-maven-4/Dockerfile b/amazoncorretto-17-debian-maven-4/Dockerfile
index 50871d69..012d8b20 100644
--- a/amazoncorretto-17-debian-maven-4/Dockerfile
+++ b/amazoncorretto-17-debian-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/amazoncorretto-17-maven-4/Dockerfile b/amazoncorretto-17-maven-4/Dockerfile
index b613cd76..46ed6b15 100644
--- a/amazoncorretto-17-maven-4/Dockerfile
+++ b/amazoncorretto-17-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/amazoncorretto-21-al2023-maven-4/Dockerfile b/amazoncorretto-21-al2023-maven-4/Dockerfile
index 1495354c..5cae43da 100644
--- a/amazoncorretto-21-al2023-maven-4/Dockerfile
+++ b/amazoncorretto-21-al2023-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/amazoncorretto-21-debian-maven-4/Dockerfile b/amazoncorretto-21-debian-maven-4/Dockerfile
index 4bbd0715..1c0af339 100644
--- a/amazoncorretto-21-debian-maven-4/Dockerfile
+++ b/amazoncorretto-21-debian-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/amazoncorretto-21-maven-4/Dockerfile b/amazoncorretto-21-maven-4/Dockerfile
index 9efa8f87..1be351ac 100644
--- a/amazoncorretto-21-maven-4/Dockerfile
+++ b/amazoncorretto-21-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/amazoncorretto-23-al2023-maven-4/Dockerfile b/amazoncorretto-23-al2023-maven-4/Dockerfile
index dfdb2a72..fb1a225e 100644
--- a/amazoncorretto-23-al2023-maven-4/Dockerfile
+++ b/amazoncorretto-23-al2023-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/amazoncorretto-23-debian-maven-4/Dockerfile b/amazoncorretto-23-debian-maven-4/Dockerfile
index 2e8b3663..81df8c94 100644
--- a/amazoncorretto-23-debian-maven-4/Dockerfile
+++ b/amazoncorretto-23-debian-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/amazoncorretto-23-maven-4/Dockerfile b/amazoncorretto-23-maven-4/Dockerfile
index 99605403..b39da465 100644
--- a/amazoncorretto-23-maven-4/Dockerfile
+++ b/amazoncorretto-23-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/azulzulu-17-alpine-maven-4/Dockerfile b/azulzulu-17-alpine-maven-4/Dockerfile
index fad62f18..bb8da3b3 100644
--- a/azulzulu-17-alpine-maven-4/Dockerfile
+++ b/azulzulu-17-alpine-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/azulzulu-17-maven-4/Dockerfile b/azulzulu-17-maven-4/Dockerfile
index dc5d161c..43824e05 100644
--- a/azulzulu-17-maven-4/Dockerfile
+++ b/azulzulu-17-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/azulzulu-21-alpine-maven-4/Dockerfile b/azulzulu-21-alpine-maven-4/Dockerfile
index 64873e0c..b96b6582 100644
--- a/azulzulu-21-alpine-maven-4/Dockerfile
+++ b/azulzulu-21-alpine-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/azulzulu-21-maven-4/Dockerfile b/azulzulu-21-maven-4/Dockerfile
index ec433914..eb5f9366 100644
--- a/azulzulu-21-maven-4/Dockerfile
+++ b/azulzulu-21-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/azulzulu-23-alpine-maven-4/Dockerfile b/azulzulu-23-alpine-maven-4/Dockerfile
index 7817f23b..5e489bcc 100644
--- a/azulzulu-23-alpine-maven-4/Dockerfile
+++ b/azulzulu-23-alpine-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/azulzulu-23-maven-4/Dockerfile b/azulzulu-23-maven-4/Dockerfile
index cd35338f..9cc463e0 100644
--- a/azulzulu-23-maven-4/Dockerfile
+++ b/azulzulu-23-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/eclipse-temurin-17-alpine-maven-4/Dockerfile b/eclipse-temurin-17-alpine-maven-4/Dockerfile
index 6fcc546f..722ca172 100644
--- a/eclipse-temurin-17-alpine-maven-4/Dockerfile
+++ b/eclipse-temurin-17-alpine-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/eclipse-temurin-17-focal-maven-4/Dockerfile b/eclipse-temurin-17-focal-maven-4/Dockerfile
index 5c776103..801a1c0d 100644
--- a/eclipse-temurin-17-focal-maven-4/Dockerfile
+++ b/eclipse-temurin-17-focal-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/eclipse-temurin-21-alpine-maven-4/Dockerfile b/eclipse-temurin-21-alpine-maven-4/Dockerfile
index ab303920..5ef8a816 100644
--- a/eclipse-temurin-21-alpine-maven-4/Dockerfile
+++ b/eclipse-temurin-21-alpine-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/eclipse-temurin-21-jammy-maven-4/Dockerfile b/eclipse-temurin-21-jammy-maven-4/Dockerfile
index 3f2a2b04..64508c14 100644
--- a/eclipse-temurin-21-jammy-maven-4/Dockerfile
+++ b/eclipse-temurin-21-jammy-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/eclipse-temurin-21-maven-4/Dockerfile b/eclipse-temurin-21-maven-4/Dockerfile
index adc22a32..9c395d15 100644
--- a/eclipse-temurin-21-maven-4/Dockerfile
+++ b/eclipse-temurin-21-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/eclipse-temurin-23-alpine-maven-4/Dockerfile b/eclipse-temurin-23-alpine-maven-4/Dockerfile
index c5177c47..34ee4513 100644
--- a/eclipse-temurin-23-alpine-maven-4/Dockerfile
+++ b/eclipse-temurin-23-alpine-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/eclipse-temurin-23-maven-4/Dockerfile b/eclipse-temurin-23-maven-4/Dockerfile
index 4cd33240..58eac975 100644
--- a/eclipse-temurin-23-maven-4/Dockerfile
+++ b/eclipse-temurin-23-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/eclipse-temurin-23-noble-maven-4/Dockerfile b/eclipse-temurin-23-noble-maven-4/Dockerfile
index 5589971b..2f40e23d 100644
--- a/eclipse-temurin-23-noble-maven-4/Dockerfile
+++ b/eclipse-temurin-23-noble-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/graalvm-community-17-maven-4/Dockerfile b/graalvm-community-17-maven-4/Dockerfile
index adc52a3d..e8c615f2 100644
--- a/graalvm-community-17-maven-4/Dockerfile
+++ b/graalvm-community-17-maven-4/Dockerfile
@@ -9,9 +9,9 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/graalvm-community-21-maven-4/Dockerfile b/graalvm-community-21-maven-4/Dockerfile
index 9df559f3..0ec63be1 100644
--- a/graalvm-community-21-maven-4/Dockerfile
+++ b/graalvm-community-21-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/graalvm-community-23-maven-4/Dockerfile b/graalvm-community-23-maven-4/Dockerfile
index 5c9f9d01..e9fc4282 100644
--- a/graalvm-community-23-maven-4/Dockerfile
+++ b/graalvm-community-23-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/ibm-semeru-17-focal-maven-4/Dockerfile b/ibm-semeru-17-focal-maven-4/Dockerfile
index cc65a5f8..66d11530 100644
--- a/ibm-semeru-17-focal-maven-4/Dockerfile
+++ b/ibm-semeru-17-focal-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/ibm-semeru-21-jammy-maven-4/Dockerfile b/ibm-semeru-21-jammy-maven-4/Dockerfile
index 7cef6ae8..cbe6f1ce 100644
--- a/ibm-semeru-21-jammy-maven-4/Dockerfile
+++ b/ibm-semeru-21-jammy-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/ibm-semeru-23-jammy-maven-4/Dockerfile b/ibm-semeru-23-jammy-maven-4/Dockerfile
index dc6c43c0..7ce6057c 100644
--- a/ibm-semeru-23-jammy-maven-4/Dockerfile
+++ b/ibm-semeru-23-jammy-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/libericaopenjdk-17-alpine-maven-4/Dockerfile b/libericaopenjdk-17-alpine-maven-4/Dockerfile
index 3db7f435..17f7eac8 100644
--- a/libericaopenjdk-17-alpine-maven-4/Dockerfile
+++ b/libericaopenjdk-17-alpine-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/libericaopenjdk-17-debian-maven-4/Dockerfile b/libericaopenjdk-17-debian-maven-4/Dockerfile
index 94f0b022..b64f33cc 100644
--- a/libericaopenjdk-17-debian-maven-4/Dockerfile
+++ b/libericaopenjdk-17-debian-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/microsoft-openjdk-17-ubuntu-maven-4/Dockerfile b/microsoft-openjdk-17-ubuntu-maven-4/Dockerfile
index d5109683..c64013a3 100644
--- a/microsoft-openjdk-17-ubuntu-maven-4/Dockerfile
+++ b/microsoft-openjdk-17-ubuntu-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/microsoft-openjdk-21-ubuntu-maven-4/Dockerfile b/microsoft-openjdk-21-ubuntu-maven-4/Dockerfile
index 8a1aa298..a23fd1d1 100644
--- a/microsoft-openjdk-21-ubuntu-maven-4/Dockerfile
+++ b/microsoft-openjdk-21-ubuntu-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/oracle-graalvm-17-maven-4/Dockerfile b/oracle-graalvm-17-maven-4/Dockerfile
index 028a54a7..02641f4d 100644
--- a/oracle-graalvm-17-maven-4/Dockerfile
+++ b/oracle-graalvm-17-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/oracle-graalvm-21-maven-4/Dockerfile b/oracle-graalvm-21-maven-4/Dockerfile
index e2485af0..372e50e8 100644
--- a/oracle-graalvm-21-maven-4/Dockerfile
+++ b/oracle-graalvm-21-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/oracle-graalvm-23-maven-4/Dockerfile b/oracle-graalvm-23-maven-4/Dockerfile
index d6b269ce..0c6e4713 100644
--- a/oracle-graalvm-23-maven-4/Dockerfile
+++ b/oracle-graalvm-23-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/sapmachine-17-maven-4/Dockerfile b/sapmachine-17-maven-4/Dockerfile
index 60cab8d6..278447a1 100644
--- a/sapmachine-17-maven-4/Dockerfile
+++ b/sapmachine-17-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/sapmachine-21-maven-4/Dockerfile b/sapmachine-21-maven-4/Dockerfile
index ad215df8..68b862b1 100644
--- a/sapmachine-21-maven-4/Dockerfile
+++ b/sapmachine-21-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/sapmachine-22-maven-4/Dockerfile b/sapmachine-22-maven-4/Dockerfile
index a33466c6..38d93bc8 100644
--- a/sapmachine-22-maven-4/Dockerfile
+++ b/sapmachine-22-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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/sapmachine-23-maven-4/Dockerfile b/sapmachine-23-maven-4/Dockerfile
index 2fcae340..1a45d3bb 100644
--- a/sapmachine-23-maven-4/Dockerfile
+++ b/sapmachine-23-maven-4/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:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-beta-5-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-beta-5-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
 

From 0626f6e830d8b22d1ff75149cb88b54674e461ca Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Mon, 28 Oct 2024 11:54:08 +0100
Subject: [PATCH 2/2] chore: fix tag naming

---
 common.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/common.sh b/common.sh
index 32976820..9b4d8c41 100755
--- a/common.sh
+++ b/common.sh
@@ -40,20 +40,23 @@ if [[ -d /usr/local/opt/gnu-sed/libexec/gnubin ]]; then
 fi
 
 version-aliases() {
-	local version=$1
+	local dir=$1
 	local branch=$2
 
-	dockerfileMavenVersion="$(grep -m1 'ARG MAVEN_VERSION=' "$version/Dockerfile" | cut -d'=' -f2)"
+	dockerfileMavenVersion="$(grep -m1 'ARG MAVEN_VERSION=' "$dir/Dockerfile" | cut -d'=' -f2)"
 	mavenVersion="${dockerfileMavenVersion}"
 
 	extraSuffixes=()
-	extraSuffixesString="$(grep -m1 '# EXTRA_TAG_SUFFIXES=' "$version/Dockerfile" | cut -d'=' -f2)"
+	extraSuffixesString="$(grep -m1 '# EXTRA_TAG_SUFFIXES=' "$dir/Dockerfile" | cut -d'=' -f2)"
 	if [ -n "${extraSuffixesString}" ]; then
 		for suffix in ${extraSuffixesString//,/ }; do
 			extraSuffixes+=("${suffix}")
 		done
 	fi
 
+	# dirs with -maven-4 suffix get that removed
+	local version="${dir/-maven-4/}"
+
 	versionAliases=()
 	while [ "${mavenVersion%[.-]*}" != "$mavenVersion" ]; do
 		versionAliases+=("$mavenVersion-$version")