diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
index 76f387b84..547871ab3 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
@@ -17,22 +17,14 @@
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>n</CDP_ENABLED>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
@@ -42,13 +34,13 @@
       <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
       <IVSHMEM>
         <IVSHMEM_ENABLED>n</IVSHMEM_ENABLED>
-        <IVSHMEM_REGION/>
+        <IVSHMEM_REGION></IVSHMEM_REGION>
       </IVSHMEM>
     </FEATURES>
     <MEMORY>
       <STACK_SIZE>0x2000</STACK_SIZE>
-      <HV_RAM_SIZE/>
-      <HV_RAM_START/>
+      <HV_RAM_SIZE></HV_RAM_SIZE>
+      <HV_RAM_START></HV_RAM_START>
       <LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
       <PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
     </MEMORY>
@@ -75,8 +67,7 @@
     <cpu_affinity>
       <pcpu_id>3</pcpu_id>
     </cpu_affinity>
-    <pt_intx>
-        </pt_intx>
+    <pt_intx>        </pt_intx>
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
@@ -94,7 +85,7 @@
       <name>Zephyr</name>
       <kern_type>KERNEL_ZEPHYR</kern_type>
       <kern_mod>Zephyr_RawImage</kern_mod>
-      <ramdisk_mod/>
+      <ramdisk_mod></ramdisk_mod>
       <bootargs/>
       <kern_load_addr>0x8000</kern_load_addr>
       <kern_entry_addr>0x8000</kern_entry_addr>
@@ -120,7 +111,7 @@
       <target_uart_id>1</target_uart_id>
     </communication_vuart>
     <pci_devs>
-      <pci_dev/>
+      <pci_dev></pci_dev>
     </pci_devs>
     <mmio_resources>
       <TPM2>n</TPM2>
@@ -150,7 +141,7 @@
       <name>ACRN Service OS</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
-      <ramdisk_mod/>
+      <ramdisk_mod></ramdisk_mod>
       <bootargs>SOS_VM_BOOTARGS</bootargs>
     </os_config>
     <legacy_vuart id="0">
@@ -174,12 +165,11 @@
       <target_uart_id>1</target_uart_id>
     </communication_vuart>
     <pci_devs>
-      <pci_dev/>
+      <pci_dev></pci_dev>
     </pci_devs>
     <board_private>
-      <rootfs>/dev/sda3</rootfs>
-      <bootargs>
-        rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
+      <rootfs>/dev/nvme0n1p3</rootfs>
+      <bootargs>        rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
         i915.nuclear_pageflip=1 swiotlb=131072
         </bootargs>
     </board_private>
@@ -221,4 +211,41 @@
     </communication_vuart>
     <PTM>n</PTM>
   </vm>
+  <vm id="3">
+    <vm_type>POST_STD_VM</vm_type>
+    <guest_flags>
+      <guest_flag>0</guest_flag>
+    </guest_flags>
+    <cpu_affinity>
+      <pcpu_id>2</pcpu_id>
+    </cpu_affinity>
+    <clos>
+      <vcpu_clos>0</vcpu_clos>
+    </clos>
+    <epc_section>
+      <base>0</base>
+      <size>0</size>
+    </epc_section>
+    <legacy_vuart id="0">
+      <type>VUART_LEGACY_PIO</type>
+      <base>COM1_BASE</base>
+      <irq>COM1_IRQ</irq>
+    </legacy_vuart>
+    <legacy_vuart id="1">
+      <type>VUART_LEGACY_PIO</type>
+      <base>INVALID_COM_BASE</base>
+      <irq>COM2_IRQ</irq>
+      <target_vm_id>0</target_vm_id>
+      <target_uart_id>0</target_uart_id>
+    </legacy_vuart>
+    <console_vuart id="0">
+      <base>INVALID_PCI_BASE</base>
+    </console_vuart>
+    <communication_vuart id="1">
+      <base>INVALID_PCI_BASE</base>
+      <target_vm_id>1</target_vm_id>
+      <target_uart_id>1</target_uart_id>
+    </communication_vuart>
+    <PTM>n</PTM>
+  </vm>
 </acrn-config>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2uos.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2uos.xml
new file mode 100644
index 000000000..060e9d4b9
--- /dev/null
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2uos.xml
@@ -0,0 +1,87 @@
+<acrn-config board="nuc11tnbi5" scenario="hybrid" uos_launcher="2">
+    <uos id="1">
+	<uos_type desc="UOS type">WINDOWS</uos_type>
+	<rtos_type desc="UOS Realtime capability">no</rtos_type>
+	<mem_size desc="UOS memory size in MByte">4096</mem_size>
+	<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
+	<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
+	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
+	<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
+	<enable_ptm desc="enable ptm of uos">n</enable_ptm>
+	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
+	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
+		<pcpu_id></pcpu_id>
+	</cpu_affinity>
+	<shm_regions desc="List of shared memrory regions for inter-VM communication.">
+		<shm_region desc="configure the shm regions for current VM, formated as hv:/shm_region_0,2097152"></shm_region>
+	</shm_regions>
+	<console_vuart desc="A PCI based console vuart which is emulated by device model">Disable</console_vuart>
+	<communication_vuarts desc="List of PCI based communication vuarts which are emulated by device model">
+		<communication_vuart></communication_vuart>
+	</communication_vuarts>
+	<passthrough_devices>
+		<usb_xdci desc="vm usb_xdci device"></usb_xdci>
+		<audio desc="vm audio device"></audio>
+		<audio_codec desc="vm audio codec device"></audio_codec>
+		<ipu desc="vm ipu device"></ipu>
+		<ipu_i2c desc="vm ipu_i2c device"></ipu_i2c>
+		<cse desc="vm cse device"></cse>
+		<wifi desc="vm wifi device"></wifi>
+		<bluetooth desc="vm bluetooth"></bluetooth>
+		<sd_card desc="vm sd card device"></sd_card>
+		<ethernet desc="vm ethernet device"></ethernet>
+		<sata desc="vm sata device"></sata>
+		<nvme desc="vm nvme device"></nvme>
+	</passthrough_devices>
+
+	<virtio_devices>
+		<network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">WaaG</network>
+		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./win10-ltsc.img</block>
+		<console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]"></console>
+	</virtio_devices>
+    </uos>
+    <uos id="2">
+        <uos_type desc="UOS type">YOCTO</uos_type>
+        <rtos_type desc="UOS Realtime capability">no</rtos_type>
+        <mem_size desc="UOS memory size in MByte">512</mem_size>
+        <gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
+        <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
+        <vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
+        <poweroff_channel desc="the method of power off uos" />
+        <allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
+        <enable_ptm desc="enable ptm of uos">n</enable_ptm>
+        <usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4" />
+        <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
+            <pcpu_id />
+        </cpu_affinity>
+            <shm_regions desc="List of shared memory regions for inter-VM communication.">
+                    <shm_region desc="configure the shm regions for current VM, for example hv:/sharename,2"></shm_region>
+            </shm_regions>
+        <console_vuart desc="A PCI based console vuart which is emulated by device model">Disable</console_vuart>
+        <communication_vuarts desc="List of PCI based communication vuarts which are emulated by device model">
+            <communication_vuart></communication_vuart>
+        </communication_vuarts>
+        <passthrough_devices>
+            <usb_xdci desc="vm usb_xdci device" />
+            <audio desc="vm audio device" />
+            <audio_codec desc="vm audio codec device" />
+            <ipu desc="vm ipu device" />
+            <ipu_i2c desc="vm ipu_i2c device" />
+            <cse desc="vm cse device" />
+            <wifi desc="vm wifi device" />
+            <bluetooth desc="vm bluetooth" />
+            <sd_card desc="vm sd card device" />
+            <ethernet desc="vm ethernet device" />
+            <sata desc="vm sata device" />
+            <nvme desc="vm nvme device" />
+        </passthrough_devices>
+        <virtio_devices>
+            <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]">@stdio:stdio_port</console>
+            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">YaaG</network>
+            <input desc="virtio input device" />
+            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
+        </virtio_devices>
+    </uos>
+</acrn-config>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_rt.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_rt.xml
deleted file mode 100644
index 41ef90775..000000000
--- a/misc/config_tools/data/nuc11tnbi5/hybrid_rt.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<acrn-config board="nuc11tnbi5" scenario="hybrid_rt">
-  <hv>
-    <DEBUG_OPTIONS>
-      <RELEASE>n</RELEASE>
-      <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
-      <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
-      <NPK_LOGLEVEL>5</NPK_LOGLEVEL>
-      <CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
-      <LOG_DESTINATION>7</LOG_DESTINATION>
-      <LOG_BUF_SIZE>0x40000</LOG_BUF_SIZE>
-    </DEBUG_OPTIONS>
-    <FEATURES>
-      <RELOC>y</RELOC>
-      <SCHEDULER>SCHED_BVT</SCHEDULER>
-      <MULTIBOOT2>y</MULTIBOOT2>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <RDT>
-        <RDT_ENABLED>n</RDT_ENABLED>
-        <CDP_ENABLED>n</CDP_ENABLED>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-      </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
-      <HYPERV_ENABLED>y</HYPERV_ENABLED>
-      <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
-      <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
-      <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
-      <IVSHMEM>
-        <IVSHMEM_ENABLED>y</IVSHMEM_ENABLED>
-        <IVSHMEM_REGION>hv:/shm_region_0, 2, 0:2</IVSHMEM_REGION>
-      </IVSHMEM>
-    </FEATURES>
-    <MEMORY>
-      <STACK_SIZE>0x2000</STACK_SIZE>
-      <HV_RAM_SIZE/>
-      <HV_RAM_START/>
-      <LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
-      <PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
-    </MEMORY>
-    <CAPACITIES>
-      <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
-      <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
-      <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
-      <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
-      <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
-      <MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
-      <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
-      <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
-    </CAPACITIES>
-    <MISC_CFG>
-      <GPU_SBDF>0x00000010</GPU_SBDF>
-      <UEFI_OS_LOADER_NAME/>
-    </MISC_CFG>
-  </hv>
-  <vm id="0">
-    <vm_type>PRE_RT_VM</vm_type>
-    <name>ACRN PRE-LAUNCHED VM0</name>
-    <guest_flags>
-      <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
-      <guest_flag>GUEST_FLAG_RT</guest_flag>
-    </guest_flags>
-    <cpu_affinity>
-      <pcpu_id>2</pcpu_id>
-      <pcpu_id>3</pcpu_id>
-    </cpu_affinity>
-    <clos>
-      <vcpu_clos>0</vcpu_clos>
-      <vcpu_clos>0</vcpu_clos>
-    </clos>
-    <epc_section>
-      <base>0</base>
-      <size>0</size>
-    </epc_section>
-    <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x40000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <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/>
-      <bootargs>rw rootwait root=/dev/sda3 no_ipi_broadcast=1 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel consoleblank=0 tsc=reliable clocksource=tsc x2apic_phys processor.max_cstate=0 intel_idle.max_cstate=0 intel_pstate=disable mce=ignore_ce audit=0 isolcpus=nohz,domain,1 nohz_full=1 rcu_nocbs=1 nosoftlockup idle=poll irqaffinity=0 reboot=acpi </bootargs>
-    </os_config>
-    <legacy_vuart id="0">
-      <type>VUART_LEGACY_PIO</type>
-      <base>COM1_BASE</base>
-      <irq>COM1_IRQ</irq>
-    </legacy_vuart>
-    <legacy_vuart id="1">
-      <type>VUART_LEGACY_PIO</type>
-      <base>COM2_BASE</base>
-      <irq>COM2_IRQ</irq>
-      <target_vm_id>1</target_vm_id>
-      <target_uart_id>1</target_uart_id>
-    </legacy_vuart>
-    <console_vuart id="0">
-      <base>INVALID_PCI_BASE</base>
-    </console_vuart>
-    <communication_vuart id="1">
-      <base>INVALID_PCI_BASE</base>
-      <target_vm_id>1</target_vm_id>
-      <target_uart_id>1</target_uart_id>
-    </communication_vuart>
-    <pci_devs>
-      <pci_dev>00:17.0 SATA controller: Intel Corporation Device 4b63</pci_dev>
-      <pci_dev>00:1d.2 Ethernet controller: Intel Corporation Device 4bb0</pci_dev>
-    </pci_devs>
-    <mmio_resources>
-      <TPM2>y</TPM2>
-    </mmio_resources>
-  </vm>
-  <vm id="1">
-    <vm_type>SOS_VM</vm_type>
-    <name>ACRN SOS VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
-    <cpu_affinity>
-      <pcpu_id>0</pcpu_id>
-      <pcpu_id>1</pcpu_id>
-    </cpu_affinity>
-    <clos>
-      <vcpu_clos>0</vcpu_clos>
-      <vcpu_clos>0</vcpu_clos>
-    </clos>
-    <memory>
-      <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/>
-      <bootargs>SOS_VM_BOOTARGS</bootargs>
-    </os_config>
-    <legacy_vuart id="0">
-      <type>VUART_LEGACY_PIO</type>
-      <base>SOS_COM1_BASE</base>
-      <irq>SOS_COM1_IRQ</irq>
-    </legacy_vuart>
-    <legacy_vuart id="1">
-      <type>VUART_LEGACY_PIO</type>
-      <base>SOS_COM2_BASE</base>
-      <irq>SOS_COM2_IRQ</irq>
-      <target_vm_id>0</target_vm_id>
-      <target_uart_id>1</target_uart_id>
-    </legacy_vuart>
-    <console_vuart id="0">
-      <base>INVALID_PCI_BASE</base>
-    </console_vuart>
-    <communication_vuart id="1">
-      <base>INVALID_PCI_BASE</base>
-      <target_vm_id>0</target_vm_id>
-      <target_uart_id>1</target_uart_id>
-    </communication_vuart>
-    <pci_devs>
-      <pci_dev/>
-    </pci_devs>
-    <board_private>
-      <rootfs>/dev/nvme0n1p3</rootfs>
-      <bootargs>
-            rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
-            i915.nuclear_pageflip=1 swiotlb=131072
-            </bootargs>
-    </board_private>
-  </vm>
-  <vm id="2">
-    <vm_type>POST_STD_VM</vm_type>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
-    <cpu_affinity>
-      <pcpu_id>0</pcpu_id>
-      <pcpu_id>1</pcpu_id>
-    </cpu_affinity>
-    <clos>
-      <vcpu_clos>0</vcpu_clos>
-      <vcpu_clos>0</vcpu_clos>
-    </clos>
-    <epc_section>
-      <base>0</base>
-      <size>0</size>
-    </epc_section>
-    <legacy_vuart id="0">
-      <type>VUART_LEGACY_PIO</type>
-      <base>COM1_BASE</base>
-      <irq>COM1_IRQ</irq>
-    </legacy_vuart>
-    <legacy_vuart id="1">
-      <type>VUART_LEGACY_PIO</type>
-      <base>INVALID_COM_BASE</base>
-      <irq>COM2_IRQ</irq>
-      <target_vm_id>0</target_vm_id>
-      <target_uart_id>0</target_uart_id>
-    </legacy_vuart>
-    <console_vuart id="0">
-      <base>INVALID_PCI_BASE</base>
-    </console_vuart>
-    <communication_vuart id="1">
-      <base>INVALID_PCI_BASE</base>
-      <target_vm_id>0</target_vm_id>
-      <target_uart_id>1</target_uart_id>
-    </communication_vuart>
-    <PTM>n</PTM>
-  </vm>
-  <vm id="3">
-    <vm_type>POST_STD_VM</vm_type>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
-    <cpu_affinity>
-      <pcpu_id>1</pcpu_id>
-    </cpu_affinity>
-    <clos>
-      <vcpu_clos>0</vcpu_clos>
-    </clos>
-    <epc_section>
-      <base>0</base>
-      <size>0</size>
-    </epc_section>
-    <legacy_vuart id="0">
-      <type>VUART_LEGACY_PIO</type>
-      <base>COM1_BASE</base>
-      <irq>COM1_IRQ</irq>
-    </legacy_vuart>
-    <legacy_vuart id="1">
-      <type>VUART_LEGACY_PIO</type>
-      <base>INVALID_COM_BASE</base>
-      <irq>COM2_IRQ</irq>
-      <target_vm_id>0</target_vm_id>
-      <target_uart_id>0</target_uart_id>
-    </legacy_vuart>
-    <console_vuart id="0">
-      <base>INVALID_PCI_BASE</base>
-    </console_vuart>
-    <communication_vuart id="1">
-      <base>INVALID_PCI_BASE</base>
-      <target_vm_id>1</target_vm_id>
-      <target_uart_id>1</target_uart_id>
-    </communication_vuart>
-    <PTM>n</PTM>
-  </vm>
-</acrn-config>
diff --git a/misc/config_tools/data/nuc11tnbi5/industry.xml b/misc/config_tools/data/nuc11tnbi5/industry.xml
index 3bdcaac04..5061e48f3 100644
--- a/misc/config_tools/data/nuc11tnbi5/industry.xml
+++ b/misc/config_tools/data/nuc11tnbi5/industry.xml
@@ -17,14 +17,14 @@
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>y</CDP_ENABLED>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
diff --git a/misc/config_tools/data/nuc11tnbi5/industry_launch_2uos.xml b/misc/config_tools/data/nuc11tnbi5/industry_launch_2uos.xml
deleted file mode 100644
index af2c05e9c..000000000
--- a/misc/config_tools/data/nuc11tnbi5/industry_launch_2uos.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<acrn-config board="nuc11tnbi5" scenario="industry" uos_launcher="2">
-  <uos id="1">
-    <uos_type desc="UOS type">WINDOWS</uos_type>
-    <rtos_type desc="UOS Realtime capability">no</rtos_type>
-    <mem_size desc="UOS memory size in MByte">4096</mem_size>
-    <gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
-    <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-    <vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
-    <poweroff_channel desc="the method of power off uos"></poweroff_channel>
-    <enable_ptm desc="enable ptm of uos">n</enable_ptm>
-    <usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
-    <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
-      <pcpu_id/>
-    </cpu_affinity>
-    <shm_regions desc="List of shared memory regions for inter-VM communication.">
-      <shm_region desc="configure the shm regions for current VM, for example hv:/sharename,2"></shm_region>
-    </shm_regions>
-    <console_vuart desc="A PCI based console vuart which is emulated by device model">Disable</console_vuart>
-    <communication_vuarts desc="List of PCI based communication vuarts which are emulated by device model">
-      <communication_vuart/>
-    </communication_vuarts>
-    <passthrough_devices>
-      <usb_xdci desc="vm usb_xdci device"></usb_xdci>
-      <audio desc="vm audio device"></audio>
-      <audio_codec desc="vm audio codec device"></audio_codec>
-      <ipu desc="vm ipu device"></ipu>
-      <ipu_i2c desc="vm ipu_i2c device"></ipu_i2c>
-      <cse desc="vm cse device"></cse>
-      <wifi desc="vm wifi device"></wifi>
-      <bluetooth desc="vm bluetooth"></bluetooth>
-      <sd_card desc="vm sd card device"></sd_card>
-      <ethernet desc="vm ethernet device"></ethernet>
-      <sata desc="vm sata device"></sata>
-      <nvme desc="vm nvme device"></nvme>
-    </passthrough_devices>
-    <virtio_devices>
-      <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]"></console>
-      <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">WaaG</network>
-      <input desc="virtio input device"></input>
-      <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./win10-ltsc.img</block>
-    </virtio_devices>
-  </uos>
-  <uos id="2">
-    <uos_type desc="UOS type">PREEMPT-RT LINUX</uos_type>
-    <rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>
-    <mem_size desc="UOS memory size in MByte">1024</mem_size>
-    <gvt_args configurable="0" desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."/>
-    <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-    <vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
-    <poweroff_channel desc="the method of power off uos"></poweroff_channel>
-    <enable_ptm desc="enable ptm of uos">n</enable_ptm>
-    <usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
-    <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
-      <pcpu_id/>
-    </cpu_affinity>
-    <shm_regions desc="List of shared memory regions for inter-VM communication.">
-      <shm_region desc="configure the shm regions for current VM, for example hv:/sharename,2"></shm_region>
-    </shm_regions>
-    <console_vuart desc="A PCI based console vuart which is emulated by device model">Disable</console_vuart>
-    <communication_vuarts desc="List of PCI based communication vuarts which are emulated by device model">
-      <communication_vuart/>
-    </communication_vuarts>
-    <passthrough_devices>
-      <usb_xdci desc="vm usb_xdci device"></usb_xdci>
-      <audio desc="vm audio device"></audio>
-      <audio_codec desc="vm audio codec device"></audio_codec>
-      <ipu desc="vm ipu device"></ipu>
-      <ipu_i2c desc="vm ipu_i2c device"></ipu_i2c>
-      <cse desc="vm cse device"></cse>
-      <wifi desc="vm wifi device"></wifi>
-      <bluetooth desc="vm bluetooth"></bluetooth>
-      <sd_card desc="vm sd card device"></sd_card>
-      <ethernet desc="vm ethernet device"></ethernet>
-      <sata desc="vm sata device"></sata>
-      <nvme desc="vm nvme device"></nvme>
-    </passthrough_devices>
-    <virtio_devices>
-      <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]">@stdio:stdio_port</console>
-      <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX]."></network>
-      <input desc="virtio input device"></input>
-      <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img"></block>
-    </virtio_devices>
-  </uos>
-</acrn-config>
diff --git a/misc/config_tools/data/nuc11tnbi5/industry_launch_6uos.xml b/misc/config_tools/data/nuc11tnbi5/industry_launch_6uos.xml
new file mode 100644
index 000000000..a60d2fc37
--- /dev/null
+++ b/misc/config_tools/data/nuc11tnbi5/industry_launch_6uos.xml
@@ -0,0 +1,257 @@
+<acrn-config board="nuc11tnbi5" scenario="industry" uos_launcher="6">
+    <uos id="1">
+	<uos_type desc="UOS type">WINDOWS</uos_type>
+	<rtos_type desc="UOS Realtime capability">no</rtos_type>
+	<mem_size desc="UOS memory size in MByte">4096</mem_size>
+	<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
+	<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
+	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
+	<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
+	<enable_ptm desc="enable ptm of uos">n</enable_ptm>
+	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
+	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
+		<pcpu_id></pcpu_id>
+	</cpu_affinity>
+	<shm_regions desc="List of shared memory regions for inter-VM communication.">
+		<shm_region desc="configure the shm regions for current VM, for example hv:/sharename,2"></shm_region>
+	</shm_regions>
+	<console_vuart desc="A PCI based console vuart which is emulated by device model">Disable</console_vuart>
+	<communication_vuarts desc="List of PCI based communication vuarts which are emulated by device model">
+		<communication_vuart></communication_vuart>
+	</communication_vuarts>
+	<passthrough_devices>
+		<usb_xdci desc="vm usb_xdci device"></usb_xdci>
+		<audio desc="vm audio device"></audio>
+		<audio_codec desc="vm audio codec device"></audio_codec>
+		<ipu desc="vm ipu device"></ipu>
+		<ipu_i2c desc="vm ipu_i2c device"></ipu_i2c>
+		<cse desc="vm cse device"></cse>
+		<wifi desc="vm wifi device"></wifi>
+		<bluetooth desc="vm bluetooth"></bluetooth>
+		<sd_card desc="vm sd card device"></sd_card>
+		<ethernet desc="vm ethernet device"></ethernet>
+		<sata desc="vm sata device"></sata>
+		<nvme desc="vm nvme device"></nvme>
+	</passthrough_devices>
+
+	<virtio_devices>
+		<network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">WaaG</network>
+		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./win10-ltsc.img</block>
+		<console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]"></console>
+	</virtio_devices>
+    </uos>
+
+    <uos id="2">
+	<uos_type desc="UOS type">PREEMPT-RT LINUX</uos_type>
+	<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>
+	<mem_size desc="UOS memory size in MByte">1024</mem_size>
+	<gvt_args configurable="0" desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
+	<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
+	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
+    <enable_ptm desc="enable ptm of uos">n</enable_ptm>
+	<allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
+	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
+	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
+		<pcpu_id></pcpu_id>
+	</cpu_affinity>
+	<shm_regions desc="List of shared memory regions for inter-VM communication.">
+		<shm_region desc="configure the shm regions for current VM, for example hv:/sharename,2"></shm_region>
+	</shm_regions>
+	<console_vuart desc="A PCI based console vuart which is emulated by device model">Disable</console_vuart>
+	<communication_vuarts desc="List of PCI based communication vuarts which are emulated by device model">
+		<communication_vuart></communication_vuart>
+	</communication_vuarts>
+	<passthrough_devices>
+		<usb_xdci desc="vm usb_xdci device"></usb_xdci>
+		<audio desc="vm audio device"></audio>
+		<audio_codec desc="vm audio codec device"></audio_codec>
+		<ipu desc="vm ipu device"></ipu>
+		<ipu_i2c desc="vm ipu_i2c device"></ipu_i2c>
+		<cse desc="vm cse device"></cse>
+		<wifi desc="vm wifi device"></wifi>
+		<bluetooth desc="vm bluetooth"></bluetooth>
+		<sd_card desc="vm sd card device"></sd_card>
+		<ethernet desc="vm ethernet device"></ethernet>
+		<sata desc="vm sata device">00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20)</sata>
+		<nvme desc="vm nvme device"></nvme>
+	</passthrough_devices>
+
+	<virtio_devices>
+		<network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX]."></network>
+		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img"></block>
+		<console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]">@stdio:stdio_port</console>
+	</virtio_devices>
+    </uos>
+    <uos id="3">
+        <uos_type desc="UOS type">YOCTO</uos_type>
+        <rtos_type desc="UOS Realtime capability">no</rtos_type>
+        <mem_size desc="UOS memory size in MByte">512</mem_size>
+        <gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
+        <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
+        <vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
+        <poweroff_channel desc="the method of power off uos" />
+        <allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
+        <enable_ptm desc="enable ptm of uos">n</enable_ptm>
+        <usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4" />
+        <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
+            <pcpu_id />
+        </cpu_affinity>
+	    <shm_regions desc="List of shared memory regions for inter-VM communication.">
+		    <shm_region desc="configure the shm regions for current VM, for example hv:/sharename,2"></shm_region>
+	    </shm_regions>
+        <console_vuart desc="A PCI based console vuart which is emulated by device model">Disable</console_vuart>
+        <communication_vuarts desc="List of PCI based communication vuarts which are emulated by device model">
+            <communication_vuart></communication_vuart>
+        </communication_vuarts>
+        <passthrough_devices>
+            <usb_xdci desc="vm usb_xdci device" />
+            <audio desc="vm audio device" />
+            <audio_codec desc="vm audio codec device" />
+            <ipu desc="vm ipu device" />
+            <ipu_i2c desc="vm ipu_i2c device" />
+            <cse desc="vm cse device" />
+            <wifi desc="vm wifi device" />
+            <bluetooth desc="vm bluetooth" />
+            <sd_card desc="vm sd card device" />
+            <ethernet desc="vm ethernet device" />
+            <sata desc="vm sata device" />
+            <nvme desc="vm nvme device" />
+        </passthrough_devices>
+        <virtio_devices>
+            <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]">@stdio:stdio_port</console>
+            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">YaaG3</network>
+            <input desc="virtio input device" />
+            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
+        </virtio_devices>
+    </uos>
+    <uos id="4">
+        <uos_type desc="UOS type">YOCTO</uos_type>
+        <rtos_type desc="UOS Realtime capability">no</rtos_type>
+        <mem_size desc="UOS memory size in MByte">512</mem_size>
+        <gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
+        <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
+        <vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
+        <poweroff_channel desc="the method of power off uos" />
+        <allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
+        <enable_ptm desc="enable ptm of uos">n</enable_ptm>
+        <usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4" />
+        <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
+            <pcpu_id />
+        </cpu_affinity>
+        <shm_regions desc="List of shared memory regions for inter-VM communication.">
+		    <shm_region desc="configure the shm regions for current VM, for example hv:/sharename,2"></shm_region>
+	    </shm_regions>
+        <console_vuart desc="A PCI based console vuart which is emulated by device model">Disable</console_vuart>
+        <communication_vuarts desc="List of PCI based communication vuarts which are emulated by device model">
+            <communication_vuart></communication_vuart>
+        </communication_vuarts>
+        <passthrough_devices>
+            <usb_xdci desc="vm usb_xdci device" />
+            <audio desc="vm audio device" />
+            <audio_codec desc="vm audio codec device" />
+            <ipu desc="vm ipu device" />
+            <ipu_i2c desc="vm ipu_i2c device" />
+            <cse desc="vm cse device" />
+            <wifi desc="vm wifi device" />
+            <bluetooth desc="vm bluetooth" />
+            <sd_card desc="vm sd card device" />
+            <ethernet desc="vm ethernet device" />
+            <sata desc="vm sata device" />
+            <nvme desc="vm nvme device" />
+        </passthrough_devices>
+        <virtio_devices>
+            <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]">@stdio:stdio_port</console>
+            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">YaaG4</network>
+            <input desc="virtio input device" />
+            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
+        </virtio_devices>
+    </uos>
+    <uos id="5">
+        <uos_type desc="UOS type">YOCTO</uos_type>
+        <rtos_type desc="UOS Realtime capability">no</rtos_type>
+        <mem_size desc="UOS memory size in MByte">512</mem_size>
+        <gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
+        <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
+        <vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
+        <poweroff_channel desc="the method of power off uos" />
+        <allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
+        <enable_ptm desc="enable ptm of uos">n</enable_ptm>
+        <usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4" />
+        <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
+            <pcpu_id />
+        </cpu_affinity>
+        <shm_regions desc="List of shared memory regions for inter-VM communication.">
+            <shm_region desc="configure the shm regions for current VM, for example hv:/sharename,2"></shm_region>
+        </shm_regions>
+        <console_vuart desc="A PCI based console vuart which is emulated by device model">Disable</console_vuart>
+        <communication_vuarts desc="List of PCI based communication vuarts which are emulated by device model">
+            <communication_vuart></communication_vuart>
+        </communication_vuarts>
+        <passthrough_devices>
+            <usb_xdci desc="vm usb_xdci device" />
+            <audio desc="vm audio device" />
+            <audio_codec desc="vm audio codec device" />
+            <ipu desc="vm ipu device" />
+            <ipu_i2c desc="vm ipu_i2c device" />
+            <cse desc="vm cse device" />
+            <wifi desc="vm wifi device" />
+            <bluetooth desc="vm bluetooth" />
+            <sd_card desc="vm sd card device" />
+            <ethernet desc="vm ethernet device" />
+            <sata desc="vm sata device" />
+            <nvme desc="vm nvme device" />
+        </passthrough_devices>
+        <virtio_devices>
+            <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]">@stdio:stdio_port</console>
+            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">YaaG5</network>
+            <input desc="virtio input device" />
+            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
+        </virtio_devices>
+    </uos>
+    <uos id="6">
+        <uos_type desc="UOS type">YOCTO</uos_type>
+        <rtos_type desc="UOS Realtime capability">no</rtos_type>
+        <mem_size desc="UOS memory size in MByte">512</mem_size>
+        <gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
+        <vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
+        <vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
+        <poweroff_channel desc="the method of power off uos" />
+        <allow_trigger_s5 desc="allow this vm to trigger s5 shutdown flow, this flag works with poweroff_channel 'vuart1(pty)' and 'vuart1(tty)' only.">n</allow_trigger_s5>
+        <enable_ptm desc="enable ptm of uos">n</enable_ptm>
+        <usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4" />
+        <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
+            <pcpu_id />
+        </cpu_affinity>
+        <shm_regions desc="List of shared memory regions for inter-VM communication.">
+            <shm_region desc="configure the shm regions for current VM, for example hv:/sharename,2"></shm_region>
+        </shm_regions>
+        <console_vuart desc="A PCI based console vuart which is emulated by device model">Disable</console_vuart>
+        <communication_vuarts desc="List of PCI based communication vuarts which are emulated by device model">
+            <communication_vuart></communication_vuart>
+        </communication_vuarts>
+        <passthrough_devices>
+            <usb_xdci desc="vm usb_xdci device" />
+            <audio desc="vm audio device" />
+            <audio_codec desc="vm audio codec device" />
+            <ipu desc="vm ipu device" />
+            <ipu_i2c desc="vm ipu_i2c device" />
+            <cse desc="vm cse device" />
+            <wifi desc="vm wifi device" />
+            <bluetooth desc="vm bluetooth" />
+            <sd_card desc="vm sd card device" />
+            <ethernet desc="vm ethernet device" />
+            <sata desc="vm sata device" />
+            <nvme desc="vm nvme device" />
+        </passthrough_devices>
+        <virtio_devices>
+            <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]">@stdio:stdio_port</console>
+            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">YaaG6</network>
+            <input desc="virtio input device" />
+            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
+        </virtio_devices>
+    </uos>
+</acrn-config>
diff --git a/misc/config_tools/data/nuc11tnbi5/logical_partition.xml b/misc/config_tools/data/nuc11tnbi5/logical_partition.xml
index 4b2a61dc5..4c98acdf9 100644
--- a/misc/config_tools/data/nuc11tnbi5/logical_partition.xml
+++ b/misc/config_tools/data/nuc11tnbi5/logical_partition.xml
@@ -17,22 +17,14 @@
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>n</CDP_ENABLED>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
+        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
@@ -42,13 +34,13 @@
       <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
       <IVSHMEM>
         <IVSHMEM_ENABLED>n</IVSHMEM_ENABLED>
-        <IVSHMEM_REGION/>
+        <IVSHMEM_REGION></IVSHMEM_REGION>
       </IVSHMEM>
     </FEATURES>
     <MEMORY>
       <STACK_SIZE>0x2000</STACK_SIZE>
-      <HV_RAM_SIZE/>
-      <HV_RAM_START/>
+      <HV_RAM_SIZE></HV_RAM_SIZE>
+      <HV_RAM_START></HV_RAM_START>
       <LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
       <PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
     </MEMORY>
@@ -59,7 +51,7 @@
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
       <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
       <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-      <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
+      <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
       <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
     <MISC_CFG>
@@ -94,9 +86,8 @@
       <name>YOCTO</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
-      <ramdisk_mod/>
-      <bootargs>
-        rw rootwait root=/dev/sda3 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable reboot=acpi
+      <ramdisk_mod></ramdisk_mod>
+      <bootargs>        rw rootwait root=/dev/sda3 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M consoleblank=0 tsc=reliable reboot=acpi
         </bootargs>
     </os_config>
     <legacy_vuart id="0">
@@ -120,8 +111,9 @@
       <target_uart_id>1</target_uart_id>
     </communication_vuart>
     <pci_devs>
-      <pci_dev/>
-      <pci_dev/>
+      <pci_dev>00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20)</pci_dev>
+      <pci_dev>58:00.0 Ethernet controller: Intel Corporation Device 15f2 (rev 03)</pci_dev>
+      <pci_dev></pci_dev>
     </pci_devs>
     <mmio_resources>
       <TPM2>n</TPM2>
@@ -155,9 +147,8 @@
       <name>YOCTO</name>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
-      <ramdisk_mod/>
-      <bootargs>
-        rw rootwait root=/dev/sda3 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
+      <ramdisk_mod></ramdisk_mod>
+      <bootargs>        rw rootwait root=/dev/sda2 console=ttyS0 noxsave nohpet no_timer_check ignore_loglevel log_buf_len=16M
         consoleblank=0 tsc=reliable reboot=acpi
         </bootargs>
     </os_config>
@@ -182,8 +173,8 @@
       <target_uart_id>1</target_uart_id>
     </communication_vuart>
     <pci_devs>
-      <pci_dev/>
-      <pci_dev/>
+      <pci_dev>00:14.0 USB controller: Intel Corporation Device a0ed (rev 20)</pci_dev>
+      <pci_dev></pci_dev>
     </pci_devs>
     <mmio_resources>
       <TPM2>n</TPM2>