diff --git a/jdock/src/main/java/io/quarkus/images/modules/GraalVMModule.java b/jdock/src/main/java/io/quarkus/images/modules/GraalVMModule.java
index 9efdcdb8..c1569603 100644
--- a/jdock/src/main/java/io/quarkus/images/modules/GraalVMModule.java
+++ b/jdock/src/main/java/io/quarkus/images/modules/GraalVMModule.java
@@ -25,8 +25,8 @@ public class GraalVMModule extends AbstractModule {
               && rm -Rf %s""";
 
     private static final String NEW_TEMPLATE = """
-            tar xzf %s -C /opt \\
-              && mv /opt/graalvm-community-openjdk-%s* /opt/graalvm \\
+            mkdir -p /opt/graalvm \\
+              && tar xzf %s -C /opt/graalvm --strip-components=1 \\
               && rm -Rf %s""";
     private final String graalvmVersion;
 
@@ -78,7 +78,6 @@ public List<Command> commands(BuildContext bc) {
         } else {
             script = NEW_TEMPLATE.formatted(
                     "/tmp/" + artifact.name, // tar
-                    graalvmVersion,
                     "/tmp/" + artifact.name); // rm
         }
 
diff --git a/quarkus-graalvm-builder-image/graalvm.yaml b/quarkus-graalvm-builder-image/graalvm.yaml
index c523643f..e5bfc89c 100644
--- a/quarkus-graalvm-builder-image/graalvm.yaml
+++ b/quarkus-graalvm-builder-image/graalvm.yaml
@@ -16,3 +16,12 @@ images:
         sha: 941a85a690e7b1c4e1fcfac321561ca46033bba3ac4882dd15d4f45edd06726c
       - arch: arm64
         sha: 6022709c124191da5087d0b0c62c3246943b3d5a386717c8d1af593637217028
+
+  # https://github.com/graalvm/graalvm-ce-builds/releases/tag/jdk-21.0.0
+  - java-version: 21.0.0
+    tags: jdk-21
+    variants:
+      - arch: amd64
+        sha: 6c422941ccc58be5b891bb6499feeb72cd2b74d6729a29bf1fb8cc1a7d58b319
+      - arch: arm64
+        sha: bb4e92cf7eae91e474061aeae5ae75053a65cd558dbee76947827bf54d1b30a5
diff --git a/quarkus-native-s2i/graalvm.yaml b/quarkus-native-s2i/graalvm.yaml
index bac433a3..5841202d 100644
--- a/quarkus-native-s2i/graalvm.yaml
+++ b/quarkus-native-s2i/graalvm.yaml
@@ -17,6 +17,15 @@ images:
       - arch: arm64
         sha: 6022709c124191da5087d0b0c62c3246943b3d5a386717c8d1af593637217028
 
+  # https://github.com/graalvm/graalvm-ce-builds/releases/tag/jdk-21.0.0
+  - java-version: 21.0.0
+    tags: jdk-21
+    variants:
+      - arch: amd64
+        sha: 6c422941ccc58be5b891bb6499feeb72cd2b74d6729a29bf1fb8cc1a7d58b319
+      - arch: arm64
+        sha: bb4e92cf7eae91e474061aeae5ae75053a65cd558dbee76947827bf54d1b30a5
+
   - graalvm-version: 22.3.3
     java-version: 11
     tag: 22.3-java11