diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/VM.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/VM.java
index c4491a4bde65..87154b5736b1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/VM.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/VM.java
@@ -24,7 +24,6 @@
  */
 package com.oracle.svm.core;
 
-import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
@@ -40,8 +39,8 @@ public final class VM {
     public VM(String vmInfo) {
         info = vmInfo;
         version = getVersion();
-        vendor = System.getProperty("org.graalvm.vendor", "GraalVM Community");
-        vendorUrl = System.getProperty("org.graalvm.vendorurl", "https://www.graalvm.org/");
+        vendor = getVendor();
+        vendorUrl = getVendorUrl();
         vendorVersion = getVendorVersion();
     }
 
@@ -50,12 +49,18 @@ public static String getSupportUrl() {
         return System.getProperty("org.graalvm.supporturl", "https://graalvm.org/native-image/error-report/");
     }
 
+    @Platforms(Platform.HOSTED_ONLY.class)
+    public static String getVendor() {
+        return System.getProperty("org.graalvm.vendor", "GraalVM Community");
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    public static String getVendorUrl() {
+        return System.getProperty("org.graalvm.vendorurl", "https://www.graalvm.org/");
+    }
+
     public static String getVendorVersion() {
-        if (ImageInfo.inImageRuntimeCode()) {
-            return System.getProperty("java.vendor.version");
-        } else {
-            return System.getProperty("org.graalvm.vendorversion", "GraalVM CE");
-        }
+        return System.getProperty("org.graalvm.vendorversion", System.getProperty("java.vendor.version", ""));
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)
diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
index b59ea4f9da28..dc820ab0d1d7 100644
--- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
+++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -80,6 +80,7 @@
 import com.oracle.svm.core.OS;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.SubstrateUtil;
+import com.oracle.svm.core.VM;
 import com.oracle.svm.core.option.BundleMember;
 import com.oracle.svm.core.option.OptionUtils;
 import com.oracle.svm.core.option.SubstrateOptionsParser;
@@ -112,9 +113,10 @@ private static String getPlatform() {
         return (OS.getCurrent().className + "-" + SubstrateUtil.getArchitectureName()).toLowerCase();
     }
 
-    static final String graalvmVendor = System.getProperty("org.graalvm.vendor", "GraalVM Community");
-    static final String graalvmVendorUrl = System.getProperty("org.graalvm.vendorurl", "https://www.graalvm.org/");
-    static final String graalvmVendorVersion = System.getProperty("org.graalvm.vendorversion", "GraalVM CE");
+    static final String graalvmVendor = VM.getVendor();
+    static final String graalvmVendorUrl = VM.getVendorUrl();
+    static final String graalvmVendorVersion = VM.getVendorVersion();
+    static final String graalvmVersion = System.getProperty("org.graalvm.version", "dev");
 
     private static Map<String, String[]> getCompilerFlags() {
         Map<String, String[]> result = new HashMap<>();
@@ -820,6 +822,7 @@ private void prepareImageBuildArgs() {
         addImageBuilderJavaArgs("-Dorg.graalvm.vendor=" + graalvmVendor);
         addImageBuilderJavaArgs("-Dorg.graalvm.vendorurl=" + graalvmVendorUrl);
         addImageBuilderJavaArgs("-Dorg.graalvm.vendorversion=" + graalvmVendorVersion);
+        addImageBuilderJavaArgs("-Dorg.graalvm.version=" + graalvmVersion);
         addImageBuilderJavaArgs("-Dcom.oracle.graalvm.isaot=true");
         addImageBuilderJavaArgs("-Djava.system.class.loader=" + CUSTOM_SYSTEM_CLASS_LOADER);
 
@@ -1519,7 +1522,7 @@ protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> cp, LinkedHa
 
     /**
      * Adds a shutdown hook to kill the image builder process if it's still alive.
-     * 
+     *
      * @param p image builder process
      */
     private static void installImageBuilderCleanupHook(Process p) {