diff --git a/hypervisor/include/arch/x86/asm/vm_config.h b/hypervisor/include/arch/x86/asm/vm_config.h
index d3d1c2402..9bcfeeb4f 100644
--- a/hypervisor/include/arch/x86/asm/vm_config.h
+++ b/hypervisor/include/arch/x86/asm/vm_config.h
@@ -109,7 +109,6 @@ struct vuart_config {
 
 enum os_kernel_type {
 	KERNEL_BZIMAGE = 1,
-	KERNEL_ZEPHYR,
 	KERNEL_RAWIMAGE,
 	KERNEL_ELF,
 	KERNEL_UNKNOWN,
diff --git a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
index 849a6b3c3..c0f814d52 100644
--- a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
@@ -95,7 +95,7 @@
         </memory>
         <os_config>
             <name>Zephyr</name>
-            <kern_type>KERNEL_ZEPHYR</kern_type>
+            <kern_type>KERNEL_RAWIMAGE</kern_type>
             <kern_mod>Zephyr_RawImage</kern_mod>
             <ramdisk_mod/>
             <bootargs/>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid.xml b/misc/config_tools/data/ehl-crb-b/hybrid.xml
index 50f079587..3603d9e58 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid.xml
@@ -95,7 +95,7 @@
         </memory>
         <os_config>
             <name>Zephyr</name>
-            <kern_type>KERNEL_ZEPHYR</kern_type>
+            <kern_type>KERNEL_RAWIMAGE</kern_type>
             <kern_mod>Zephyr_RawImage</kern_mod>
             <ramdisk_mod/>
             <bootargs></bootargs>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
index 578602e85..ba8f5c1a3 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
@@ -85,7 +85,7 @@
     </memory>
     <os_config>
       <name>Zephyr</name>
-      <kern_type>KERNEL_ZEPHYR</kern_type>
+      <kern_type>KERNEL_RAWIMAGE</kern_type>
       <kern_mod>Zephyr_RawImage</kern_mod>
       <ramdisk_mod></ramdisk_mod>
       <bootargs/>
diff --git a/misc/config_tools/data/nuc7i7dnb/hybrid.xml b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
index 757e5e364..036cff189 100644
--- a/misc/config_tools/data/nuc7i7dnb/hybrid.xml
+++ b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
@@ -82,7 +82,7 @@
     </memory>
     <os_config>
         <name>Zephyr</name>
-        <kern_type>KERNEL_ZEPHYR</kern_type>
+        <kern_type>KERNEL_RAWIMAGE</kern_type>
         <kern_mod>Zephyr_RawImage</kern_mod>
         <ramdisk_mod/>
         <bootargs>reboot=acpi</bootargs>
diff --git a/misc/config_tools/data/tgl-rvp/hybrid.xml b/misc/config_tools/data/tgl-rvp/hybrid.xml
index 258dceab6..36fa85221 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid.xml
@@ -90,7 +90,7 @@
     </memory>
     <os_config>
         <name>Zephyr</name>
-        <kern_type>KERNEL_ZEPHYR</kern_type>
+        <kern_type>KERNEL_RAWIMAGE</kern_type>
         <kern_mod>Zephyr_RawImage</kern_mod>
         <ramdisk_mod/>
         <bootargs>reboot=acpi</bootargs>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index 76c445db5..8a6b3274b 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -82,7 +82,7 @@
     </memory>
     <os_config>
         <name>Zephyr</name>
-        <kern_type>KERNEL_ZEPHYR</kern_type>
+        <kern_type>KERNEL_RAWIMAGE</kern_type>
         <kern_mod>Zephyr_RawImage</kern_mod>
         <ramdisk_mod/>
         <bootargs>reboot=acpi</bootargs>
diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid.xml b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
index fd56e3daa..101bff0b4 100644
--- a/misc/config_tools/data/whl-ipc-i7/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
@@ -82,7 +82,7 @@
     </memory>
     <os_config>
         <name>Zephyr</name>
-        <kern_type>KERNEL_ZEPHYR</kern_type>
+        <kern_type>KERNEL_RAWIMAGE</kern_type>
         <kern_mod>Zephyr_RawImage</kern_mod>
         <ramdisk_mod/>
         <bootargs>reboot=acpi</bootargs>
diff --git a/misc/config_tools/library/scenario_cfg_lib.py b/misc/config_tools/library/scenario_cfg_lib.py
index 7649ef76e..3cfddc5fa 100644
--- a/misc/config_tools/library/scenario_cfg_lib.py
+++ b/misc/config_tools/library/scenario_cfg_lib.py
@@ -13,7 +13,7 @@ NATIVE_TTYS_DIC = {}
 
 START_HPA_LIST = ['0', '0x100000000', '0x120000000']
 
-KERN_TYPE_LIST = ['KERNEL_BZIMAGE', 'KERNEL_ZEPHYR']
+KERN_TYPE_LIST = ['KERNEL_BZIMAGE', 'KERNEL_RAWIMAGE', 'KERNEL_ELF']
 KERN_BOOT_ADDR_LIST = ['0x100000']
 
 VUART_TYPE = ['VUART_LEGACY_PIO', 'VUART_PCI']
@@ -515,7 +515,7 @@ def os_kern_load_addr_check(kern_type, id_kern_load_addr_dic, prime_item, item):
     """
 
     for id_key, kern_load_addr in id_kern_load_addr_dic.items():
-        if kern_type[id_key] != 'KERNEL_ZEPHYR':
+        if kern_type[id_key] != 'KERNEL_RAWIMAGE':
             continue
 
         if not kern_load_addr:
@@ -537,7 +537,7 @@ def os_kern_entry_addr_check(kern_type, id_kern_entry_addr_dic, prime_item, item
     """
 
     for id_key, kern_entry_addr in id_kern_entry_addr_dic.items():
-        if kern_type[id_key] != 'KERNEL_ZEPHYR':
+        if kern_type[id_key] != 'KERNEL_RAWIMAGE':
             continue
 
         if not kern_entry_addr:
diff --git a/misc/config_tools/schema/VMtypes.xsd b/misc/config_tools/schema/VMtypes.xsd
index 6ea3d3f90..21157b6bd 100644
--- a/misc/config_tools/schema/VMtypes.xsd
+++ b/misc/config_tools/schema/VMtypes.xsd
@@ -194,12 +194,13 @@ must exactly match the module tag in the GRUB multiboot cmdline.</xs:documentati
 
 <xs:simpleType name="VMKernelType">
   <xs:annotation>
-    <xs:documentation>A string with either ``KERNEL_BZIMAGE`` or
-``KERNEL_ZEPHYR``.</xs:documentation>
+    <xs:documentation>A string with either ``KERNEL_BZIMAGE``, ``KERNEL_ELF`` or
+``KERNEL_RAWIMAGE``.</xs:documentation>
   </xs:annotation>
   <xs:restriction base="xs:string">
     <xs:enumeration value="KERNEL_BZIMAGE" />
-    <xs:enumeration value="KERNEL_ZEPHYR" />
+    <xs:enumeration value="KERNEL_RAWIMAGE" />
+    <xs:enumeration value="KERNEL_ELF" />
   </xs:restriction>
 </xs:simpleType>
 
diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl
index 7245daea7..629e2c5ec 100644
--- a/misc/config_tools/xforms/config_common.xsl
+++ b/misc/config_tools/xforms/config_common.xsl
@@ -29,6 +29,7 @@
     <xsl:apply-templates select="hv/MEMORY" />
     <xsl:apply-templates select="hv/CAPACITIES" />
     <xsl:apply-templates select="hv/MISC_CFG" />
+    <xsl:apply-templates select="vm/os_config/kern_type" />
   </xsl:template>
 
   <xsl:template match="DEBUG_OPTIONS">
@@ -282,6 +283,13 @@
     </xsl:choose>
   </xsl:template>
 
+  <xsl:template match="kern_type">
+    <xsl:call-template name="boolean-by-key-value">
+      <xsl:with-param name="key" select="concat('GUEST_', current())" />
+      <xsl:with-param name="value" select="'y'" />
+    </xsl:call-template>
+  </xsl:template>
+
   <xsl:template name="hex-to-bin">
     <xsl:param name="s" />
     <xsl:param name="width" />