diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid.xml b/misc/config_tools/data/cfl-k700-i7/hybrid.xml
index a8dcc765a..838f12907 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid.xml
@@ -86,7 +86,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>Zephyr</name>
       <kern_type>KERNEL_ELF</kern_type>
       <kern_mod>Zephyr_ElfImage</kern_mod>
       <ramdisk_mod/>
@@ -117,7 +116,6 @@
       <start_hpa>0</start_hpa>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
index 30d5003b8..d7f54ddcd 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
@@ -55,7 +55,6 @@
     </CAPACITIES>
     <MISC_CFG>
       <GPU_SBDF>0x00000010</GPU_SBDF>
-      <UEFI_OS_LOADER_NAME/>
     </MISC_CFG>
     <vuart_connections>
       <vuart_connection>
@@ -96,7 +95,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>PREEMPT-RT</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>RT_bzImage</kern_mod>
       <ramdisk_mod/>
@@ -138,7 +136,6 @@
       <start_hpa>0</start_hpa>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
index a3f4548f6..71b58c69d 100644
--- a/misc/config_tools/data/cfl-k700-i7/partitioned.xml
+++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
@@ -88,7 +88,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>YOCTO</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod>Ubuntu</ramdisk_mod>
@@ -128,7 +127,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>YOCTO</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod>Ubuntu</ramdisk_mod>
diff --git a/misc/config_tools/data/cfl-k700-i7/shared.xml b/misc/config_tools/data/cfl-k700-i7/shared.xml
index 04a36b88e..c2f96e16f 100644
--- a/misc/config_tools/data/cfl-k700-i7/shared.xml
+++ b/misc/config_tools/data/cfl-k700-i7/shared.xml
@@ -41,7 +41,6 @@
     </CAPACITIES>
     <MISC_CFG>
       <GPU_SBDF>0x00000010</GPU_SBDF>
-      <UEFI_OS_LOADER_NAME>\\EFI\\BOOT\\bootx64.efi</UEFI_OS_LOADER_NAME>
     </MISC_CFG>
     <vuart_connections>
       <vuart_connection>
@@ -70,7 +69,6 @@
       <size>0x20000000</size>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml
index 76f082a22..5a1793d4c 100644
--- a/misc/config_tools/data/generic_board/hybrid.xml
+++ b/misc/config_tools/data/generic_board/hybrid.xml
@@ -86,7 +86,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>Zephyr</name>
       <kern_type>KERNEL_ELF</kern_type>
       <kern_mod>Zephyr_ElfImage</kern_mod>
       <ramdisk_mod/>
@@ -120,7 +119,6 @@
       <start_hpa>0</start_hpa>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml
index fa15a6a7d..316411c5e 100644
--- a/misc/config_tools/data/generic_board/hybrid_rt.xml
+++ b/misc/config_tools/data/generic_board/hybrid_rt.xml
@@ -68,7 +68,6 @@
     </CAPACITIES>
     <MISC_CFG>
       <GPU_SBDF>0x00000010</GPU_SBDF>
-      <UEFI_OS_LOADER_NAME/>
     </MISC_CFG>
     <vuart_connections>
       <vuart_connection>
@@ -109,7 +108,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>PREEMPT-RT</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>RT_bzImage</kern_mod>
       <ramdisk_mod/>
@@ -140,7 +138,6 @@
       <start_hpa>0</start_hpa>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml
index 884abffb2..efdca8532 100644
--- a/misc/config_tools/data/generic_board/partitioned.xml
+++ b/misc/config_tools/data/generic_board/partitioned.xml
@@ -88,7 +88,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>YOCTO</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
@@ -128,7 +127,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>YOCTO</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/generic_board/shared.xml b/misc/config_tools/data/generic_board/shared.xml
index 9a1eb183f..74f0c7f58 100644
--- a/misc/config_tools/data/generic_board/shared.xml
+++ b/misc/config_tools/data/generic_board/shared.xml
@@ -77,7 +77,6 @@
       <size>0x20000000</size>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
index a87e64e02..a12de651e 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
@@ -86,7 +86,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>Zephyr</name>
       <kern_type>KERNEL_ELF</kern_type>
       <kern_mod>Zephyr_ElfImage</kern_mod>
       <ramdisk_mod/>
@@ -120,7 +119,6 @@
       <start_hpa>0</start_hpa>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
index 4ed9de844..15b336c58 100644
--- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml
+++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
@@ -88,7 +88,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>YOCTO</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod>Ubuntu</ramdisk_mod>
@@ -128,7 +127,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>YOCTO</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod>Ubuntu</ramdisk_mod>
diff --git a/misc/config_tools/data/nuc11tnbi5/shared.xml b/misc/config_tools/data/nuc11tnbi5/shared.xml
index fe21e7f7b..fdffb8649 100644
--- a/misc/config_tools/data/nuc11tnbi5/shared.xml
+++ b/misc/config_tools/data/nuc11tnbi5/shared.xml
@@ -89,7 +89,6 @@
       <size>0x20000000</size>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/qemu/shared.xml b/misc/config_tools/data/qemu/shared.xml
index fd456ee71..07477f0bd 100644
--- a/misc/config_tools/data/qemu/shared.xml
+++ b/misc/config_tools/data/qemu/shared.xml
@@ -69,7 +69,6 @@
       <start_hpa>0</start_hpa>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
index 7fd96a817..bd8e5732b 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
@@ -86,7 +86,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>Zephyr</name>
       <kern_type>KERNEL_ELF</kern_type>
       <kern_mod>Zephyr_ElfImage</kern_mod>
       <ramdisk_mod/>
@@ -120,7 +119,6 @@
       <start_hpa>0</start_hpa>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
index 9da5af0db..03a564de9 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
@@ -88,7 +88,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>YOCTO</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod>Ubuntu</ramdisk_mod>
@@ -128,7 +127,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>YOCTO</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml
index c65bcf46b..ea5ee4efa 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml
@@ -89,7 +89,6 @@
       <size>0x20000000</size>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index 1b3211616..fc01027a2 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -78,7 +78,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>Zephyr</name>
       <kern_type>KERNEL_ELF</kern_type>
       <kern_mod>Zephyr_ElfImage</kern_mod>
       <ramdisk_mod/>
@@ -110,7 +109,6 @@
       <start_hpa>0</start_hpa>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
index 193c123f7..e38f0fc2c 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
@@ -95,7 +95,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>PREEMPT-RT</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>RT_bzImage</kern_mod>
       <ramdisk_mod/>
@@ -129,7 +128,6 @@
       <start_hpa>0</start_hpa>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
index 575707044..2cc8da3ad 100644
--- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml
+++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
@@ -80,7 +80,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>YOCTO</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
@@ -121,7 +120,6 @@
       <size_hpa2>0x0</size_hpa2>
     </memory>
     <os_config>
-      <name>YOCTO</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml
index 3cc996f00..37b6a0f87 100644
--- a/misc/config_tools/data/whl-ipc-i5/sdc.xml
+++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml
@@ -55,7 +55,6 @@
       <start_hpa>0</start_hpa>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared.xml b/misc/config_tools/data/whl-ipc-i5/shared.xml
index 551ef564b..ccb8d1e4f 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared.xml
@@ -69,7 +69,6 @@
       <size>0x20000000</size>
     </memory>
     <os_config>
-      <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
       <ramdisk_mod/>
diff --git a/misc/config_tools/schema/VMtypes.xsd b/misc/config_tools/schema/VMtypes.xsd
index 937dfd8fa..926d98c0d 100644
--- a/misc/config_tools/schema/VMtypes.xsd
+++ b/misc/config_tools/schema/VMtypes.xsd
@@ -114,22 +114,7 @@ allocations in Bytes for the VM.</xs:documentation>
 </xs:complexType>
 
 <xs:complexType name="OSConfigurations">
-  <xs:sequence>
-    <xs:element name="name">
-        <xs:annotation>
-          <xs:documentation>Specify the OS name of VM.
-Is not referenced by the hypervisor code. </xs:documentation>
-        </xs:annotation>
-        <xs:simpleType>
-        <xs:annotation>
-          <xs:documentation>A string with 1 to 32 characters.</xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="xs:string">
-          <xs:minLength value="1" />
-          <xs:maxLength value="32" />
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:element>
+  <xs:all>
     <xs:element name="kern_type" type="VMKernelType">
       <xs:annotation>
         <xs:documentation>Specify the kernel image type so the hypervisor can load it correctly.</xs:documentation>
@@ -162,7 +147,7 @@ must exactly match the module tag in the GRUB multiboot cmdline.</xs:documentati
         <xs:documentation>The entry address in host memory for the VM kernel.</xs:documentation>
       </xs:annotation>
     </xs:element>
-  </xs:sequence>
+  </xs:all>
 </xs:complexType>
 
 <xs:simpleType name="VMKernelType">
diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd
index 5b1252b43..ed19a4fff 100644
--- a/misc/config_tools/schema/config.xsd
+++ b/misc/config_tools/schema/config.xsd
@@ -276,11 +276,6 @@ If this value is empty, then the default value will be calculated from informati
         <xs:documentation>Segment, Bus, Device, and function of the GPU.</xs:documentation>
       </xs:annotation>
     </xs:element>
-    <xs:element name="UEFI_OS_LOADER_NAME" type="xs:string" minOccurs="0">
-      <xs:annotation>
-        <xs:documentation>UEFI OS loader name.</xs:documentation>
-      </xs:annotation>
-    </xs:element>
   </xs:all>
 </xs:complexType>
 
@@ -411,11 +406,6 @@ its ``id`` attribute.</xs:documentation>
         <xs:documentation>MMIO resources to passthrough.</xs:documentation>
       </xs:annotation>
     </xs:element>
-    <xs:element name="pci_dev_num" type="xs:string" minOccurs="0">
-      <xs:annotation>
-        <xs:documentation>PCI devices number of the VM.</xs:documentation>
-      </xs:annotation>
-    </xs:element>
     <xs:element name="pt_intx" type="xs:string" minOccurs="0">
       <xs:annotation>
         <xs:documentation>pt intx mapping.</xs:documentation>
diff --git a/misc/config_tools/xforms/vm_configurations.c.xsl b/misc/config_tools/xforms/vm_configurations.c.xsl
index a989ae991..6ba2360cb 100644
--- a/misc/config_tools/xforms/vm_configurations.c.xsl
+++ b/misc/config_tools/xforms/vm_configurations.c.xsl
@@ -187,15 +187,15 @@
   <xsl:template match="memory">
     <xsl:value-of select="acrn:initializer('memory', '{', true())" />
     <xsl:choose>
-      <xsl:when test="acrn:is-service-vm(../load_order)">
-        <xsl:value-of select="acrn:initializer('start_hpa', concat(start_hpa, 'UL'))" />
-      </xsl:when>
-      <xsl:otherwise>
+      <xsl:when test="acrn:is-pre-launched-vm(../load_order)">
         <xsl:value-of select="acrn:initializer('start_hpa', concat('VM', ../@id, '_CONFIG_MEM_START_HPA'))" />
         <xsl:value-of select="acrn:initializer('size', concat('VM', ../@id, '_CONFIG_MEM_SIZE'))" />
         <xsl:value-of select="acrn:initializer('start_hpa2', concat('VM', ../@id, '_CONFIG_MEM_START_HPA2'))" />
         <xsl:value-of select="acrn:initializer('size_hpa2', concat('VM', ../@id, '_CONFIG_MEM_SIZE_HPA2'))" />
-      </xsl:otherwise>
+      </xsl:when>
+      <xsl:when test="acrn:is-service-vm(../load_order)">
+        <xsl:value-of select="acrn:initializer('start_hpa', concat(start_hpa, 'UL'))" />
+      </xsl:when>
     </xsl:choose>
     <xsl:text>},</xsl:text>
     <xsl:value-of select="$newline" />