diff --git a/Dockerfile-template-maven-4 b/Dockerfile-template-maven-4
index 722b14ff..583f2771 100644
--- a/Dockerfile-template-maven-4
+++ b/Dockerfile-template-maven-4
@@ -6,13 +6,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/amazoncorretto-17-al2023-maven-4/Dockerfile b/amazoncorretto-17-al2023-maven-4/Dockerfile
index 1e35c5b0..5a9f95fd 100644
--- a/amazoncorretto-17-al2023-maven-4/Dockerfile
+++ b/amazoncorretto-17-al2023-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/amazoncorretto-17-debian-maven-4/Dockerfile b/amazoncorretto-17-debian-maven-4/Dockerfile
index 012d8b20..2c5e0c8b 100644
--- a/amazoncorretto-17-debian-maven-4/Dockerfile
+++ b/amazoncorretto-17-debian-maven-4/Dockerfile
@@ -27,13 +27,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/amazoncorretto-17-maven-4/Dockerfile b/amazoncorretto-17-maven-4/Dockerfile
index 46ed6b15..41faa641 100644
--- a/amazoncorretto-17-maven-4/Dockerfile
+++ b/amazoncorretto-17-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/amazoncorretto-17-windowsservercore-maven-4/Dockerfile b/amazoncorretto-17-windowsservercore-maven-4/Dockerfile
index c17662bd..f808a852 100644
--- a/amazoncorretto-17-windowsservercore-maven-4/Dockerfile
+++ b/amazoncorretto-17-windowsservercore-maven-4/Dockerfile
@@ -20,8 +20,8 @@ RUN Invoke-WebRequest -Uri $('{0}/{1}' -f $env:uri,$env:zip) -OutFile C:/$env:zi
 ENV JAVA_HOME=C:/ProgramData/jdk17.0.13_11
 
 ARG USER_HOME_DIR="C:/Users/ContainerUser"
-ARG MAVEN_VERSION=4.0.0-beta-5
-ARG SHA=11b176efe990df237990bde31ec558fbd7d713acefbebb81dfea9086c954cf9dc6fb080ff00c18bf7dd154d1130e98adc621212fbf58936d6111c555a1380a00
+ARG MAVEN_VERSION=4.0.0-rc-1
+ARG SHA=b514b93d23e727eb3efaf49df7ebee50b4103047d6bf1acec10265382f7aeba99265ac8a0586e4c68ef9bb3440884dff24feb369322911d44cae157643d99f3f
 ARG BASE_URL=https://apache.osuosl.org/maven/maven-4/${MAVEN_VERSION}/binaries
 
 RUN Invoke-WebRequest -Uri ${env:BASE_URL}/apache-maven-${env:MAVEN_VERSION}-bin.zip -OutFile ${env:TEMP}/apache-maven.zip ; `
diff --git a/amazoncorretto-21-al2023-maven-4/Dockerfile b/amazoncorretto-21-al2023-maven-4/Dockerfile
index 5cae43da..35620ab8 100644
--- a/amazoncorretto-21-al2023-maven-4/Dockerfile
+++ b/amazoncorretto-21-al2023-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/amazoncorretto-21-debian-maven-4/Dockerfile b/amazoncorretto-21-debian-maven-4/Dockerfile
index 1c0af339..5bd53c81 100644
--- a/amazoncorretto-21-debian-maven-4/Dockerfile
+++ b/amazoncorretto-21-debian-maven-4/Dockerfile
@@ -27,13 +27,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/amazoncorretto-21-maven-4/Dockerfile b/amazoncorretto-21-maven-4/Dockerfile
index 1be351ac..ae035522 100644
--- a/amazoncorretto-21-maven-4/Dockerfile
+++ b/amazoncorretto-21-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/amazoncorretto-23-al2023-maven-4/Dockerfile b/amazoncorretto-23-al2023-maven-4/Dockerfile
index fb1a225e..b2969e79 100644
--- a/amazoncorretto-23-al2023-maven-4/Dockerfile
+++ b/amazoncorretto-23-al2023-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/amazoncorretto-23-debian-maven-4/Dockerfile b/amazoncorretto-23-debian-maven-4/Dockerfile
index 81df8c94..f0256eb5 100644
--- a/amazoncorretto-23-debian-maven-4/Dockerfile
+++ b/amazoncorretto-23-debian-maven-4/Dockerfile
@@ -27,13 +27,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/amazoncorretto-23-maven-4/Dockerfile b/amazoncorretto-23-maven-4/Dockerfile
index b39da465..712832bd 100644
--- a/amazoncorretto-23-maven-4/Dockerfile
+++ b/amazoncorretto-23-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/azulzulu-17-alpine-maven-4/Dockerfile b/azulzulu-17-alpine-maven-4/Dockerfile
index bb8da3b3..ccfafb9c 100644
--- a/azulzulu-17-alpine-maven-4/Dockerfile
+++ b/azulzulu-17-alpine-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/azulzulu-17-maven-4/Dockerfile b/azulzulu-17-maven-4/Dockerfile
index 43824e05..7b27fb5b 100644
--- a/azulzulu-17-maven-4/Dockerfile
+++ b/azulzulu-17-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/azulzulu-17-windowsservercore-maven-4/Dockerfile b/azulzulu-17-windowsservercore-maven-4/Dockerfile
index 152cf747..88da1e65 100644
--- a/azulzulu-17-windowsservercore-maven-4/Dockerfile
+++ b/azulzulu-17-windowsservercore-maven-4/Dockerfile
@@ -18,8 +18,8 @@ RUN Invoke-WebRequest -Uri $('{0}/{1}' -f $env:uri,$env:zip) -OutFile C:/$env:zi
     Remove-Item C:/${env:zip}
 
 ARG USER_HOME_DIR="C:/Users/ContainerUser"
-ARG MAVEN_VERSION=4.0.0-beta-5
-ARG SHA=11b176efe990df237990bde31ec558fbd7d713acefbebb81dfea9086c954cf9dc6fb080ff00c18bf7dd154d1130e98adc621212fbf58936d6111c555a1380a00
+ARG MAVEN_VERSION=4.0.0-rc-1
+ARG SHA=b514b93d23e727eb3efaf49df7ebee50b4103047d6bf1acec10265382f7aeba99265ac8a0586e4c68ef9bb3440884dff24feb369322911d44cae157643d99f3f
 ARG BASE_URL=https://apache.osuosl.org/maven/maven-4/${MAVEN_VERSION}/binaries
 
 RUN Invoke-WebRequest -Uri ${env:BASE_URL}/apache-maven-${env:MAVEN_VERSION}-bin.zip -OutFile ${env:TEMP}/apache-maven.zip ; `
diff --git a/azulzulu-21-alpine-maven-4/Dockerfile b/azulzulu-21-alpine-maven-4/Dockerfile
index b96b6582..3eac44e9 100644
--- a/azulzulu-21-alpine-maven-4/Dockerfile
+++ b/azulzulu-21-alpine-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/azulzulu-21-maven-4/Dockerfile b/azulzulu-21-maven-4/Dockerfile
index eb5f9366..502ebaee 100644
--- a/azulzulu-21-maven-4/Dockerfile
+++ b/azulzulu-21-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/azulzulu-23-alpine-maven-4/Dockerfile b/azulzulu-23-alpine-maven-4/Dockerfile
index 5e489bcc..bf43e6a5 100644
--- a/azulzulu-23-alpine-maven-4/Dockerfile
+++ b/azulzulu-23-alpine-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/azulzulu-23-maven-4/Dockerfile b/azulzulu-23-maven-4/Dockerfile
index 9cc463e0..1b955da6 100644
--- a/azulzulu-23-maven-4/Dockerfile
+++ b/azulzulu-23-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/eclipse-temurin-17-alpine-maven-4/Dockerfile b/eclipse-temurin-17-alpine-maven-4/Dockerfile
index 722ca172..22bdf14a 100644
--- a/eclipse-temurin-17-alpine-maven-4/Dockerfile
+++ b/eclipse-temurin-17-alpine-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/eclipse-temurin-17-focal-maven-4/Dockerfile b/eclipse-temurin-17-focal-maven-4/Dockerfile
index 801a1c0d..1a05a894 100644
--- a/eclipse-temurin-17-focal-maven-4/Dockerfile
+++ b/eclipse-temurin-17-focal-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/eclipse-temurin-17-maven-4/Dockerfile b/eclipse-temurin-17-maven-4/Dockerfile
index 325c97e7..6ef9a916 100644
--- a/eclipse-temurin-17-maven-4/Dockerfile
+++ b/eclipse-temurin-17-maven-4/Dockerfile
@@ -1,8 +1,8 @@
 FROM eclipse-temurin:17-jdk as builder
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
-ARG SHA=e1b1a99203f478baa978d220be73ed4ae18c88bd615a6e2ef52e825b746b90c72e6f8a52d0f806f7a111f2663e2ed3ad887124ff7dcbad5a14d3d16894340d00
+ARG SHA=5aa8b80e4e6f603148ac13ef0f1e0f1890f2fc2962ea293828499be1ce6315ad4758de940c209a60962e9b3e550fda8c3adc794d43ecdc0110c1b000d8e00a5e
 ARG BASE_URL=https://dlcdn.apache.org/maven/maven-4/${MAVEN_VERSION}/binaries
 
 ENV MAVEN_HOME=/usr/share/maven
@@ -51,7 +51,7 @@ COPY settings-docker.xml /usr/share/maven/ref/
 
 RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/eclipse-temurin-21-alpine-maven-4/Dockerfile b/eclipse-temurin-21-alpine-maven-4/Dockerfile
index 5ef8a816..0756ba8b 100644
--- a/eclipse-temurin-21-alpine-maven-4/Dockerfile
+++ b/eclipse-temurin-21-alpine-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/eclipse-temurin-21-jammy-maven-4/Dockerfile b/eclipse-temurin-21-jammy-maven-4/Dockerfile
index 64508c14..f625f4b3 100644
--- a/eclipse-temurin-21-jammy-maven-4/Dockerfile
+++ b/eclipse-temurin-21-jammy-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/eclipse-temurin-21-maven-4/Dockerfile b/eclipse-temurin-21-maven-4/Dockerfile
index 9c395d15..4f24ef9c 100644
--- a/eclipse-temurin-21-maven-4/Dockerfile
+++ b/eclipse-temurin-21-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/eclipse-temurin-23-alpine-maven-4/Dockerfile b/eclipse-temurin-23-alpine-maven-4/Dockerfile
index 34ee4513..8623a9b3 100644
--- a/eclipse-temurin-23-alpine-maven-4/Dockerfile
+++ b/eclipse-temurin-23-alpine-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/eclipse-temurin-23-maven-4/Dockerfile b/eclipse-temurin-23-maven-4/Dockerfile
index 58eac975..f82c27fd 100644
--- a/eclipse-temurin-23-maven-4/Dockerfile
+++ b/eclipse-temurin-23-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/eclipse-temurin-23-noble-maven-4/Dockerfile b/eclipse-temurin-23-noble-maven-4/Dockerfile
index 2f40e23d..079ad90a 100644
--- a/eclipse-temurin-23-noble-maven-4/Dockerfile
+++ b/eclipse-temurin-23-noble-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/graalvm-community-17-maven-4/Dockerfile b/graalvm-community-17-maven-4/Dockerfile
index e8c615f2..bd9175dd 100644
--- a/graalvm-community-17-maven-4/Dockerfile
+++ b/graalvm-community-17-maven-4/Dockerfile
@@ -9,13 +9,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/graalvm-community-21-maven-4/Dockerfile b/graalvm-community-21-maven-4/Dockerfile
index 0ec63be1..91a461d1 100644
--- a/graalvm-community-21-maven-4/Dockerfile
+++ b/graalvm-community-21-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/graalvm-community-23-maven-4/Dockerfile b/graalvm-community-23-maven-4/Dockerfile
index e9fc4282..1cd5d3a3 100644
--- a/graalvm-community-23-maven-4/Dockerfile
+++ b/graalvm-community-23-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/ibm-semeru-17-focal-maven-4/Dockerfile b/ibm-semeru-17-focal-maven-4/Dockerfile
index 66d11530..7760c283 100644
--- a/ibm-semeru-17-focal-maven-4/Dockerfile
+++ b/ibm-semeru-17-focal-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/ibm-semeru-21-jammy-maven-4/Dockerfile b/ibm-semeru-21-jammy-maven-4/Dockerfile
index cbe6f1ce..6a10c325 100644
--- a/ibm-semeru-21-jammy-maven-4/Dockerfile
+++ b/ibm-semeru-21-jammy-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/ibm-semeru-23-jammy-maven-4/Dockerfile b/ibm-semeru-23-jammy-maven-4/Dockerfile
index 7ce6057c..7f34cc6a 100644
--- a/ibm-semeru-23-jammy-maven-4/Dockerfile
+++ b/ibm-semeru-23-jammy-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/libericaopenjdk-17-alpine-maven-4/Dockerfile b/libericaopenjdk-17-alpine-maven-4/Dockerfile
index 17f7eac8..7a5d5cec 100644
--- a/libericaopenjdk-17-alpine-maven-4/Dockerfile
+++ b/libericaopenjdk-17-alpine-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/libericaopenjdk-17-debian-maven-4/Dockerfile b/libericaopenjdk-17-debian-maven-4/Dockerfile
index b64f33cc..086589f8 100644
--- a/libericaopenjdk-17-debian-maven-4/Dockerfile
+++ b/libericaopenjdk-17-debian-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/microsoft-openjdk-17-ubuntu-maven-4/Dockerfile b/microsoft-openjdk-17-ubuntu-maven-4/Dockerfile
index c64013a3..f7232ef4 100644
--- a/microsoft-openjdk-17-ubuntu-maven-4/Dockerfile
+++ b/microsoft-openjdk-17-ubuntu-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/microsoft-openjdk-21-ubuntu-maven-4/Dockerfile b/microsoft-openjdk-21-ubuntu-maven-4/Dockerfile
index a23fd1d1..a18cce23 100644
--- a/microsoft-openjdk-21-ubuntu-maven-4/Dockerfile
+++ b/microsoft-openjdk-21-ubuntu-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/oracle-graalvm-17-maven-4/Dockerfile b/oracle-graalvm-17-maven-4/Dockerfile
index 02641f4d..213eb0d6 100644
--- a/oracle-graalvm-17-maven-4/Dockerfile
+++ b/oracle-graalvm-17-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/oracle-graalvm-21-maven-4/Dockerfile b/oracle-graalvm-21-maven-4/Dockerfile
index 372e50e8..2bdca0fa 100644
--- a/oracle-graalvm-21-maven-4/Dockerfile
+++ b/oracle-graalvm-21-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/oracle-graalvm-23-maven-4/Dockerfile b/oracle-graalvm-23-maven-4/Dockerfile
index 0c6e4713..f631562d 100644
--- a/oracle-graalvm-23-maven-4/Dockerfile
+++ b/oracle-graalvm-23-maven-4/Dockerfile
@@ -10,13 +10,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/sapmachine-17-maven-4/Dockerfile b/sapmachine-17-maven-4/Dockerfile
index 278447a1..a4e1dee0 100644
--- a/sapmachine-17-maven-4/Dockerfile
+++ b/sapmachine-17-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/sapmachine-21-maven-4/Dockerfile b/sapmachine-21-maven-4/Dockerfile
index 68b862b1..82ebe921 100644
--- a/sapmachine-21-maven-4/Dockerfile
+++ b/sapmachine-21-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/sapmachine-22-maven-4/Dockerfile b/sapmachine-22-maven-4/Dockerfile
index 38d93bc8..7f612bd7 100644
--- a/sapmachine-22-maven-4/Dockerfile
+++ b/sapmachine-22-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/sapmachine-23-maven-4/Dockerfile b/sapmachine-23-maven-4/Dockerfile
index 1a45d3bb..7a10837a 100644
--- a/sapmachine-23-maven-4/Dockerfile
+++ b/sapmachine-23-maven-4/Dockerfile
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.description="Apache Maven is a software project m
 
 ENV MAVEN_HOME=/usr/share/maven
 
-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
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=ghcr.io/carlossg/maven:4.0.0-rc-1-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
 
-ARG MAVEN_VERSION=4.0.0-beta-5
+ARG MAVEN_VERSION=4.0.0-rc-1
 ARG USER_HOME_DIR="/root"
 ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2"
 
diff --git a/tests/tests.bats b/tests/tests.bats
index 9097e568..5f51aa71 100644
--- a/tests/tests.bats
+++ b/tests/tests.bats
@@ -19,7 +19,7 @@ base_image=eclipse-temurin-17
 			base_dir="${base_dir}-maven-4"
 		fi
 		cd $BATS_TEST_DIRNAME/../$base_dir
-		base_tag=$(grep -m 1 -o 'maven:[a-z0-9\.-]*' $BATS_TEST_DIRNAME/../$SUT_TAG/Dockerfile)
+		base_tag=$(grep -m 1 -o '[a-z:/\.]*maven:[a-z0-9\.-]*' $BATS_TEST_DIRNAME/../$SUT_TAG/Dockerfile)
 		echo $base_tag
 		docker build --pull -t $base_tag .
 	fi