diff --git a/openjdk-runtime/Dockerfile b/openjdk-runtime/Dockerfile
index 80d5b05..4672be7 100644
--- a/openjdk-runtime/Dockerfile
+++ b/openjdk-runtime/Dockerfile
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest AS ubi-minimal
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest AS ubi-minimal
 
 # Add OpenJDK (complete).
 ADD jdk-dist/latest.tar.gz /jdk
@@ -23,7 +23,7 @@
 RUN find /java -exec touch --date=@0 '{}' ';'
 
 # Build the final image.
-FROM registry.access.redhat.com/ubi8/ubi-micro:latest
+FROM registry.access.redhat.com/ubi9/ubi-micro:latest
 COPY --from=ubi-minimal /lib64/libz.so.1 /lib64/
 COPY --from=ubi-minimal /java /java
 ENV JAVA_HOME=/java
diff --git a/openjdk-runtime/build b/openjdk-runtime/build
index 01347d7..0719996 100755
--- a/openjdk-runtime/build
+++ b/openjdk-runtime/build
@@ -17,8 +17,8 @@
         --mount type=bind,src="$PWD",target=/workspace \
         gcr.io/kaniko-project/warmer:latest \
         --cache-dir=/workspace/cache \
-        --image=registry.access.redhat.com/ubi8/ubi-micro:latest \
-        --image=registry.access.redhat.com/ubi8/ubi-minimal:latest
+        --image=registry.access.redhat.com/ubi9/ubi-micro:latest \
+        --image=registry.access.redhat.com/ubi9/ubi-minimal:latest
 
     docker run \
         --mount type=bind,src="$PWD",target=/workspace \