diff --git a/almalinux/9/Dockerfile b/almalinux/9/Dockerfile
index ca0f0f1..fb03b98 100644
--- a/almalinux/9/Dockerfile
+++ b/almalinux/9/Dockerfile
@@ -1,5 +1,5 @@
 FROM almalinux:9.4
-MAINTAINER Gerrit Code Review Community
+LABEL org.opencontainers.image.authors="luca.milanesio@gmail.com"
 
 # Add Gerrit packages repository
 RUN rpm -i https://gerritforge.com/gerritforge-repo-1-4.noarch.rpm
@@ -9,8 +9,9 @@
 # Install OS pre-prequisites, OpenJDK and Gerrit in two subsequent transactions
 # (pre-trans Gerrit script needs to have access to the Java command)
 RUN yum -y install initscripts && \
-    yum -y install java-17-openjdk && \
-    yum -y install gerrit-3.10.2-1 && \
+    yum -y install java-21-openjdk
+
+RUN yum -y install gerrit-3.11.0-0rc0 && \
     /entrypoint.sh init && \
     rm -f /var/gerrit/etc/{ssh,secure}* && rm -Rf /var/gerrit/{static,index,logs,data,index,cache,git,db,tmp}/* && chown -R gerrit:gerrit /var/gerrit && \
     yum -y clean all
diff --git a/almalinux/9/Dockerfile-dev b/almalinux/9/Dockerfile-dev
index e9b27ba..d645b2b 100644
--- a/almalinux/9/Dockerfile-dev
+++ b/almalinux/9/Dockerfile-dev
@@ -1,5 +1,5 @@
 FROM almalinux:9.4
-MAINTAINER Gerrit Code Review Community
+LABEL org.opencontainers.image.authors="luca.milanesio@gmail.com"
 
 # Allow remote connectivity and sudo and install OpenJDK and Git
 # (pre-trans Gerrit script needs to have access to the Java command)
@@ -7,7 +7,7 @@
     openssh-clients \
     initscripts \
     sudo \
-    java-17-openjdk \
+    java-21-openjdk \
     git && \
     yum -y clean all
 
diff --git a/build_multiplatform.sh b/build_multiplatform.sh
index c50fa8b..e4c3cd1 100755
--- a/build_multiplatform.sh
+++ b/build_multiplatform.sh
@@ -71,7 +71,7 @@
 
 echo
 echo "### Building ubuntu multi-platform: [$PLATFORMS] iamges"
-(cd ubuntu/22 && docker buildx build --platform "$PLATFORMS" --no-cache -t "$DOCKER_USER:${VERSION}-ubuntu22" "$DESTINATION" .)
+(cd ubuntu/24 && docker buildx build --platform "$PLATFORMS" --no-cache -t "$DOCKER_USER:${VERSION}-ubuntu24" "$DESTINATION" .)
 
 echo
 echo "### Removing multi-platform builder"
diff --git a/ubuntu/22/.dockerignore b/ubuntu/24/.dockerignore
similarity index 100%
rename from ubuntu/22/.dockerignore
rename to ubuntu/24/.dockerignore
diff --git a/ubuntu/22/Dockerfile b/ubuntu/24/Dockerfile
similarity index 88%
rename from ubuntu/22/Dockerfile
rename to ubuntu/24/Dockerfile
index cc0bb87..1a705f7 100644
--- a/ubuntu/22/Dockerfile
+++ b/ubuntu/24/Dockerfile
@@ -1,5 +1,5 @@
-FROM eclipse-temurin:17-jammy
-MAINTAINER Gerrit Code Review Community
+FROM eclipse-temurin:21.0.5_11-jdk-noble
+LABEL org.opencontainers.image.authors="luca.milanesio@gmail.com"
 
 # Add Gerrit packages repository
 RUN apt-get update && \
@@ -18,7 +18,7 @@
 # hence it is the only extra step that had to be added
 RUN update-alternatives --install /usr/bin/java java $(which java) 2222 && \
     apt-get -y upgrade && \
-    apt-get -y install gerrit=3.10.2-1 && \
+    apt-get -y install gerrit=3.11.0-0rc0 && \
     apt-mark hold gerrit && \
     /entrypoint.sh init && \
     bash -c 'rm -f /var/gerrit/etc/{ssh,secure}* && rm -Rf /var/gerrit/{static,index,logs,data,index,cache,git,db,tmp}/*' && \
diff --git a/ubuntu/22/Dockerfile-dev b/ubuntu/24/Dockerfile-dev
similarity index 94%
rename from ubuntu/22/Dockerfile-dev
rename to ubuntu/24/Dockerfile-dev
index 86ee9e6..9e0dab1 100644
--- a/ubuntu/22/Dockerfile-dev
+++ b/ubuntu/24/Dockerfile-dev
@@ -1,5 +1,5 @@
 FROM eclipse-temurin:17-jammy
-MAINTAINER Gerrit Code Review Community
+LABEL org.opencontainers.image.authors="luca.milanesio@gmail.com"
 
 # Install OpenJDK and Git and allow remote connectivity and sudo
 RUN apt-get update && apt-get -y install \
diff --git a/ubuntu/22/entrypoint.sh b/ubuntu/24/entrypoint.sh
similarity index 100%
rename from ubuntu/22/entrypoint.sh
rename to ubuntu/24/entrypoint.sh