diff --git a/infra/base-images/base-builder-jvm/Dockerfile b/infra/base-images/base-builder-jvm/Dockerfile
index 48c7d76af5c9..c3b2c66a77d9 100644
--- a/infra/base-images/base-builder-jvm/Dockerfile
+++ b/infra/base-images/base-builder-jvm/Dockerfile
@@ -18,6 +18,7 @@ FROM gcr.io/oss-fuzz-base/base-builder AS base
 
 ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64
 ENV JAVA_15_HOME /usr/lib/jvm/java-15-openjdk-amd64
+ENV JAVA_25_HOME /usr/lib/jvm/java-25-openjdk-amd64
 ENV JVM_LD_LIBRARY_PATH $JAVA_HOME/lib/server
 ENV PATH $PATH:$JAVA_HOME/bin
 ENV JAZZER_API_PATH "/usr/local/lib/jazzer_api_deploy.jar"
diff --git a/infra/base-images/base-builder-jvm/ubuntu-20-04.Dockerfile b/infra/base-images/base-builder-jvm/ubuntu-20-04.Dockerfile
index 330986dcb0db..b196e863309e 100644
--- a/infra/base-images/base-builder-jvm/ubuntu-20-04.Dockerfile
+++ b/infra/base-images/base-builder-jvm/ubuntu-20-04.Dockerfile
@@ -18,6 +18,7 @@ FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-20-04 AS base
 
 ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64
 ENV JAVA_15_HOME /usr/lib/jvm/java-15-openjdk-amd64
+ENV JAVA_25_HOME /usr/lib/jvm/java-25-openjdk-amd64
 ENV JVM_LD_LIBRARY_PATH $JAVA_HOME/lib/server
 ENV PATH $PATH:$JAVA_HOME/bin
 ENV JAZZER_API_PATH "/usr/local/lib/jazzer_api_deploy.jar"
diff --git a/infra/base-images/base-builder-jvm/ubuntu-24-04.Dockerfile b/infra/base-images/base-builder-jvm/ubuntu-24-04.Dockerfile
index e389312fd6fc..70d87cef409c 100644
--- a/infra/base-images/base-builder-jvm/ubuntu-24-04.Dockerfile
+++ b/infra/base-images/base-builder-jvm/ubuntu-24-04.Dockerfile
@@ -18,6 +18,7 @@ FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04 AS base
 
 ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64
 ENV JAVA_15_HOME /usr/lib/jvm/java-15-openjdk-amd64
+ENV JAVA_25_HOME /usr/lib/jvm/java-25-openjdk-amd64
 ENV JVM_LD_LIBRARY_PATH $JAVA_HOME/lib/server
 ENV PATH $PATH:$JAVA_HOME/bin
 ENV JAZZER_API_PATH "/usr/local/lib/jazzer_api_deploy.jar"
diff --git a/infra/base-images/base-builder/install_java.sh b/infra/base-images/base-builder/install_java.sh
index 43574af240db..157ce812f6f4 100755
--- a/infra/base-images/base-builder/install_java.sh
+++ b/infra/base-images/base-builder/install_java.sh
@@ -29,3 +29,9 @@ mkdir -p $JAVA_15_HOME
 tar -xz --strip-components=1 -f openjdk-15.0.2_linux-x64_bin.tar.gz --directory $JAVA_15_HOME && \
 rm -f openjdk-15.0.2_linux-x64_bin.tar.gz
 rm -rf $JAVA_15_HOME/jmods $JAVA_15_HOME/lib/src.zip
+
+curl --silent -L -O https://corretto.aws/downloads/latest/amazon-corretto-25-x64-linux-jdk.tar.gz && \
+mkdir -p $JAVA_25_HOME
+tar -xz --strip-components=1 -f amazon-corretto-25-x64-linux-jdk.tar.gz --directory $JAVA_25_HOME && \
+rm -f amazon-corretto-25-x64-linux-jdk.tar.gz
+rm -rf $JAVA_25_HOME/jmods $JAVA_25_HOME/lib/src.zip
diff --git a/infra/base-images/base-runner/Dockerfile b/infra/base-images/base-runner/Dockerfile
index 509603477ac0..045dc6e0edcf 100644
--- a/infra/base-images/base-runner/Dockerfile
+++ b/infra/base-images/base-runner/Dockerfile
@@ -94,6 +94,7 @@ RUN /install_go.sh && rm -rf /install_go.sh /root/.go
 # Install OpenJDK 15 and trim its size by removing unused components.
 ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 ENV JAVA_15_HOME=/usr/lib/jvm/java-15-openjdk-amd64
+ENV JAVA_25_HOME=/usr/lib/jvm/java-25-openjdk-amd64
 ENV JVM_LD_LIBRARY_PATH=$JAVA_HOME/lib/server
 ENV PATH=$PATH:$JAVA_HOME/bin
 
diff --git a/infra/base-images/base-runner/install_java.sh b/infra/base-images/base-runner/install_java.sh
index d950e874c801..7847af4f48f7 100755
--- a/infra/base-images/base-runner/install_java.sh
+++ b/infra/base-images/base-runner/install_java.sh
@@ -44,3 +44,9 @@ mkdir -p $JAVA_15_HOME
 tar -xz --strip-components=1 -f openjdk-15.0.2_linux-"$ARCHITECTURE"_bin.tar.gz --directory $JAVA_15_HOME
 rm -f openjdk-15.0.2_linux-"$ARCHITECTURE"_bin.tar.gz
 rm -rf $JAVA_15_HOME/jmods $JAVA_15_HOME/lib/src.zip
+
+curl --silent -L -O https://corretto.aws/downloads/latest/amazon-corretto-25-"$ARCHITECTURE"-linux-jdk.tar.gz && \
+mkdir -p $JAVA_25_HOME
+tar -xz --strip-components=1 -f amazon-corretto-25-"$ARCHITECTURE"-linux-jdk.tar.gz --directory $JAVA_25_HOME && \
+rm -f amazon-corretto-25-"$ARCHITECTURE"-linux-jdk.tar.gz
+rm -rf $JAVA_25_HOME/jmods $JAVA_25_HOME/lib/src.zip
diff --git a/infra/base-images/base-runner/ubuntu-20-04.Dockerfile b/infra/base-images/base-runner/ubuntu-20-04.Dockerfile
index 22640a02b56d..6e82c98fdfff 100644
--- a/infra/base-images/base-runner/ubuntu-20-04.Dockerfile
+++ b/infra/base-images/base-runner/ubuntu-20-04.Dockerfile
@@ -94,6 +94,7 @@ RUN /install_go.sh && rm -rf /install_go.sh /root/.go
 # Install OpenJDK 15 and trim its size by removing unused components.
 ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 ENV JAVA_15_HOME=/usr/lib/jvm/java-15-openjdk-amd64
+ENV JAVA_25_HOME=/usr/lib/jvm/java-25-openjdk-amd64
 ENV JVM_LD_LIBRARY_PATH=$JAVA_HOME/lib/server
 ENV PATH=$PATH:$JAVA_HOME/bin
 
diff --git a/infra/base-images/base-runner/ubuntu-24-04.Dockerfile b/infra/base-images/base-runner/ubuntu-24-04.Dockerfile
index 0fd7003ac828..4902718abc68 100644
--- a/infra/base-images/base-runner/ubuntu-24-04.Dockerfile
+++ b/infra/base-images/base-runner/ubuntu-24-04.Dockerfile
@@ -94,6 +94,7 @@ RUN /install_go.sh && rm -rf /install_go.sh /root/.go
 # Install OpenJDK 15 and trim its size by removing unused components.
 ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 ENV JAVA_15_HOME=/usr/lib/jvm/java-15-openjdk-amd64
+ENV JAVA_25_HOME=/usr/lib/jvm/java-25-openjdk-amd64
 ENV JVM_LD_LIBRARY_PATH=$JAVA_HOME/lib/server
 ENV PATH=$PATH:$JAVA_HOME/bin