diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index b8aea2cd..b6063f8e 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -43,12 +43,12 @@ jobs:
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
           - variant: java25-graalvm
-            baseImage: container-registry.oracle.com/graalvm/jdk:25-ol8
+            baseImage: container-registry.oracle.com/graalvm/jdk:25-ol9
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
         # JAVA 21:
           - variant: java21-graalvm
-            baseImage: container-registry.oracle.com/graalvm/jdk:21-ol8
+            baseImage: container-registry.oracle.com/graalvm/jdk:21-ol9
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
           - variant: java21
@@ -70,7 +70,7 @@ jobs:
             platforms: linux/amd64,linux/arm/v7,linux/arm64
             mcVersion: 1.20.4
           - variant: java17-graalvm
-            baseImage: container-registry.oracle.com/graalvm/jdk:17-ol8
+            baseImage: container-registry.oracle.com/graalvm/jdk:17-ol9
             platforms: linux/amd64,linux/arm64
             mcVersion: 1.20.4
           - variant: java17-alpine
diff --git a/docs/versions/java.md b/docs/versions/java.md
index f854b3f3..d88841ca 100644
--- a/docs/versions/java.md
+++ b/docs/versions/java.md
@@ -31,7 +31,7 @@ Notes
 
 1. Why no arm64 for Java 17 Alpine? That is because the base images, such as [elipse-temurin](https://hub.docker.com/_/eclipse-temurin/tags?page=&page_size=&ordering=&name=17-jre-alpine) do not provide support for that. Use the Ubuntu based images instead.
 2. Short-term variant, subject to deprecation upon next version introduction
-3. Based on the [Oracle GraalMV images](https://blogs.oracle.com/java/post/new-oracle-graalvm-container-images), which as of JDK 17, are now under the [GraalVM Free License](https://blogs.oracle.com/java/post/graalvm-free-license) incorporating what used to be known as the GraalVM Enterprise.
+3. Based on the [Oracle GraalVM images](https://blogs.oracle.com/java/post/new-oracle-graalvm-container-images), which as of JDK 17, are now under the [GraalVM Free License](https://blogs.oracle.com/java/post/graalvm-free-license) incorporating what used to be known as the GraalVM Enterprise.
 4. This version of Java is [recommended for PaperMC 1.16.5](https://docs.papermc.io/paper/getting-started/#requirements)
 
 !!! example "Example using java8"