diff --git a/Dockerfile-template b/Dockerfile-template
index 48c8cb4c..f2c40b82 100644
--- a/Dockerfile-template
+++ b/Dockerfile-template
@@ -1,9 +1,9 @@
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/amazoncorretto-17-al2023/Dockerfile
index 596742e1..656d30c8 100644
--- a/amazoncorretto-17-al2023/Dockerfile
+++ b/amazoncorretto-17-al2023/Dockerfile
@@ -5,9 +5,9 @@ RUN yum install -y tar which gzip findutils # TODO remove
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/amazoncorretto-17-debian/Dockerfile
index e627c7af..682bd8c1 100644
--- a/amazoncorretto-17-debian/Dockerfile
+++ b/amazoncorretto-17-debian/Dockerfile
@@ -21,9 +21,9 @@ ENV JAVA_HOME "/usr/lib/jvm/java-17-amazon-corretto"
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/amazoncorretto-17/Dockerfile
index dee9ec8c..05d669f1 100644
--- a/amazoncorretto-17/Dockerfile
+++ b/amazoncorretto-17/Dockerfile
@@ -5,9 +5,9 @@ RUN yum install -y tar which gzip # TODO remove
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/amazoncorretto-21-al2023/Dockerfile
index 8261a095..abcdcdc9 100644
--- a/amazoncorretto-21-al2023/Dockerfile
+++ b/amazoncorretto-21-al2023/Dockerfile
@@ -5,9 +5,9 @@ RUN yum install -y tar which gzip findutils # TODO remove
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/amazoncorretto-21-debian/Dockerfile
index 0b05aad3..03418cce 100644
--- a/amazoncorretto-21-debian/Dockerfile
+++ b/amazoncorretto-21-debian/Dockerfile
@@ -21,9 +21,9 @@ ENV JAVA_HOME "/usr/lib/jvm/java-21-amazon-corretto"
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/amazoncorretto-21/Dockerfile
index 1e5adc48..84c6b8ef 100644
--- a/amazoncorretto-21/Dockerfile
+++ b/amazoncorretto-21/Dockerfile
@@ -5,9 +5,9 @@ RUN yum install -y tar which gzip # TODO remove
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/azulzulu-17-alpine/Dockerfile
index c8e9f288..b79e30d7 100644
--- a/azulzulu-17-alpine/Dockerfile
+++ b/azulzulu-17-alpine/Dockerfile
@@ -5,9 +5,9 @@ RUN apk add --no-cache bash procps curl tar
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/azulzulu-17/Dockerfile
index ca88444d..9171d1c7 100644
--- a/azulzulu-17/Dockerfile
+++ b/azulzulu-17/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/azulzulu-21-alpine/Dockerfile
index b9b038d6..4931f551 100644
--- a/azulzulu-21-alpine/Dockerfile
+++ b/azulzulu-21-alpine/Dockerfile
@@ -5,9 +5,9 @@ RUN apk add --no-cache bash procps curl tar
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/azulzulu-21/Dockerfile
index faa48d16..5d328be6 100644
--- a/azulzulu-21/Dockerfile
+++ b/azulzulu-21/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/eclipse-temurin-17-alpine/Dockerfile
index 26771867..35a03cd4 100644
--- a/eclipse-temurin-17-alpine/Dockerfile
+++ b/eclipse-temurin-17-alpine/Dockerfile
@@ -5,9 +5,9 @@ RUN apk add --no-cache bash procps curl tar
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/eclipse-temurin-17-focal/Dockerfile
index 98645d74..23694eee 100644
--- a/eclipse-temurin-17-focal/Dockerfile
+++ b/eclipse-temurin-17-focal/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/eclipse-temurin-21-alpine/Dockerfile
index fd198ccf..492a086f 100644
--- a/eclipse-temurin-21-alpine/Dockerfile
+++ b/eclipse-temurin-21-alpine/Dockerfile
@@ -5,9 +5,9 @@ RUN apk add --no-cache bash procps curl tar
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/eclipse-temurin-21-jammy/Dockerfile
index 201ff336..89fa7d78 100644
--- a/eclipse-temurin-21-jammy/Dockerfile
+++ b/eclipse-temurin-21-jammy/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/eclipse-temurin-21/Dockerfile
index 10786c2e..9d1862f7 100644
--- a/eclipse-temurin-21/Dockerfile
+++ b/eclipse-temurin-21/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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-22-alpine/Dockerfile b/eclipse-temurin-22-alpine/Dockerfile
index 7f402cef..65b4cfad 100644
--- a/eclipse-temurin-22-alpine/Dockerfile
+++ b/eclipse-temurin-22-alpine/Dockerfile
@@ -5,9 +5,9 @@ RUN apk add --no-cache bash procps curl tar
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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-22-jammy/Dockerfile b/eclipse-temurin-22-jammy/Dockerfile
index 3ab9f496..96b02b0b 100644
--- a/eclipse-temurin-22-jammy/Dockerfile
+++ b/eclipse-temurin-22-jammy/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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-22/Dockerfile b/eclipse-temurin-22/Dockerfile
index 2609da3e..fc9b3f75 100644
--- a/eclipse-temurin-22/Dockerfile
+++ b/eclipse-temurin-22/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/graalvm-community-17/Dockerfile
index 426c4e1f..94f8761e 100644
--- a/graalvm-community-17/Dockerfile
+++ b/graalvm-community-17/Dockerfile
@@ -3,9 +3,9 @@ FROM ghcr.io/graalvm/graalvm-community:17
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/graalvm-community-21/Dockerfile
index 82ec62d4..1be787d7 100644
--- a/graalvm-community-21/Dockerfile
+++ b/graalvm-community-21/Dockerfile
@@ -3,9 +3,9 @@ FROM ghcr.io/graalvm/graalvm-community:21
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/ibm-semeru-17-focal/Dockerfile
index 1ca3f25f..e1c960bf 100644
--- a/ibm-semeru-17-focal/Dockerfile
+++ b/ibm-semeru-17-focal/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/ibm-semeru-21-jammy/Dockerfile
index 0af7fa11..6feec9ea 100644
--- a/ibm-semeru-21-jammy/Dockerfile
+++ b/ibm-semeru-21-jammy/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/libericaopenjdk-17-alpine/Dockerfile
index eeb9fd6f..9fea255a 100644
--- a/libericaopenjdk-17-alpine/Dockerfile
+++ b/libericaopenjdk-17-alpine/Dockerfile
@@ -5,9 +5,9 @@ RUN apk add --no-cache bash procps curl tar
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/libericaopenjdk-17-debian/Dockerfile
index f963fb94..31f25cd6 100644
--- a/libericaopenjdk-17-debian/Dockerfile
+++ b/libericaopenjdk-17-debian/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/libericaopenjdk-17/Dockerfile
index 0463c494..b4d86074 100644
--- a/libericaopenjdk-17/Dockerfile
+++ b/libericaopenjdk-17/Dockerfile
@@ -3,9 +3,9 @@ FROM bellsoft/liberica-openjdk-centos:17
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/microsoft-openjdk-17-ubuntu/Dockerfile
index c2ab5b4c..12f30821 100644
--- a/microsoft-openjdk-17-ubuntu/Dockerfile
+++ b/microsoft-openjdk-17-ubuntu/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/microsoft-openjdk-21-ubuntu/Dockerfile
index 473d45f2..4e9c8546 100644
--- a/microsoft-openjdk-21-ubuntu/Dockerfile
+++ b/microsoft-openjdk-21-ubuntu/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/oracle-graalvm-17/Dockerfile
index 87c98fed..e4bb9f81 100644
--- a/oracle-graalvm-17/Dockerfile
+++ b/oracle-graalvm-17/Dockerfile
@@ -5,9 +5,9 @@ RUN microdnf --refresh -y install findutils
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/oracle-graalvm-21/Dockerfile
index 92cbc27e..bad9b41b 100644
--- a/oracle-graalvm-21/Dockerfile
+++ b/oracle-graalvm-21/Dockerfile
@@ -5,9 +5,9 @@ RUN microdnf --refresh -y install findutils
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/sapmachine-17/Dockerfile
index 61f064e1..fcf0da75 100644
--- a/sapmachine-17/Dockerfile
+++ b/sapmachine-17/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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/Dockerfile b/sapmachine-21/Dockerfile
index 2c1d9646..b2a62fb8 100644
--- a/sapmachine-21/Dockerfile
+++ b/sapmachine-21/Dockerfile
@@ -7,9 +7,9 @@ RUN apt-get update \
 # common for all images
 ENV MAVEN_HOME /usr/share/maven
 
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
-COPY --from=maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY --from=maven:4.0.0-alpha-13-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-alpha-13-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-alpha-13-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