diff --git a/android/vm/src/main.rs b/android/vm/src/main.rs
index 110e0ca..81ca8fa 100644
--- a/android/vm/src/main.rs
+++ b/android/vm/src/main.rs
@@ -155,10 +155,10 @@
     #[arg(long)]
     devices: Vec<PathBuf>,
 
-    /// Version of OS to use. If not set, defaults to microdroid.
-    /// You can list all available OSes via `vm info` command.
+    /// Version of GKI to use. If set, use instead of microdroid kernel
+    #[cfg(vendor_modules)]
     #[arg(long)]
-    os: Option<String>,
+    gki: Option<String>,
 }
 
 impl MicrodroidConfig {
@@ -172,6 +172,16 @@
         }
     }
 
+    fn gki(&self) -> Option<&str> {
+        cfg_if::cfg_if! {
+            if #[cfg(vendor_modules)] {
+                self.gki.as_deref()
+            } else {
+                None
+            }
+        }
+    }
+
     fn devices(&self) -> &[PathBuf] {
         cfg_if::cfg_if! {
             if #[cfg(device_assignment)] {
diff --git a/android/vm/src/run.rs b/android/vm/src/run.rs
index b07a472..0e1f4cc 100644
--- a/android/vm/src/run.rs
+++ b/android/vm/src/run.rs
@@ -140,7 +140,11 @@
         bail!("Either --config-path or --payload-binary-name must be defined")
     };
 
-    let os_name = if let Some(ref os) = config.microdroid.os { os } else { "microdroid" };
+    let os_name = if let Some(ver) = config.microdroid.gki() {
+        format!("microdroid_gki-{ver}")
+    } else {
+        "microdroid".to_owned()
+    };
 
     let payload_config_str = format!("{:?}!{:?}", config.apk, payload);
 
@@ -188,7 +192,7 @@
         memoryMib: config.common.mem.unwrap_or(0) as i32, // 0 means use the VM default
         cpuTopology: config.common.cpu_topology,
         customConfig: Some(custom_config),
-        osName: os_name.to_string(),
+        osName: os_name,
         hugePages: config.common.hugepages,
         boostUclamp: config.common.boost_uclamp,
     });