diff --git a/almalinux/10/Dockerfile b/almalinux/10/Dockerfile
index feff9f4..3ca5fa9 100644
--- a/almalinux/10/Dockerfile
+++ b/almalinux/10/Dockerfile
@@ -19,6 +19,11 @@
     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
 
+# Java 25 detection isn't working properly, fixed in master with https://gerrit-review.googlesource.com/c/552261
+RUN yum -y erase java-21-openjdk && \
+    yum -y install java-25-openjdk && \
+    git config -f /var/gerrit/etc/gerrit.config container.javaHome /usr/lib/jvm/java-25-openjdk
+
 USER gerrit
 
 ENV CANONICAL_WEB_URL=
diff --git a/almalinux/10/Dockerfile-dev b/almalinux/10/Dockerfile-dev
index 5073136..964e564 100644
--- a/almalinux/10/Dockerfile-dev
+++ b/almalinux/10/Dockerfile-dev
@@ -7,7 +7,7 @@
     openssh-clients \
     initscripts \
     sudo \
-    java-21-openjdk \
+    java-25-openjdk \
     git && \
     yum -y clean all