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
         }