diff --git a/misc/config_tools/data/apl-mrb/logical_partition.xml b/misc/config_tools/data/apl-mrb/logical_partition.xml
index e431d7cf2..a2c4731fc 100644
--- a/misc/config_tools/data/apl-mrb/logical_partition.xml
+++ b/misc/config_tools/data/apl-mrb/logical_partition.xml
@@ -63,7 +63,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM0</name>
     <guest_flags>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>0</pcpu_id>
@@ -125,7 +125,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM1</name>
     <guest_flags>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>1</pcpu_id>
diff --git a/misc/config_tools/data/apl-up2-n3350/logical_partition.xml b/misc/config_tools/data/apl-up2-n3350/logical_partition.xml
index 1e358fde6..4205c08d8 100644
--- a/misc/config_tools/data/apl-up2-n3350/logical_partition.xml
+++ b/misc/config_tools/data/apl-up2-n3350/logical_partition.xml
@@ -63,8 +63,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM0</name>
     <guest_flags>
-        <guest_flag/>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>0</pcpu_id>
@@ -124,7 +123,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM1</name>
     <guest_flags>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>1</pcpu_id>
diff --git a/misc/config_tools/data/apl-up2/logical_partition.xml b/misc/config_tools/data/apl-up2/logical_partition.xml
index 9614df0af..7f5e89166 100644
--- a/misc/config_tools/data/apl-up2/logical_partition.xml
+++ b/misc/config_tools/data/apl-up2/logical_partition.xml
@@ -63,8 +63,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM0</name>
     <guest_flags>
-        <guest_flag/>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>0</pcpu_id>
@@ -126,7 +125,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM1</name>
     <guest_flags>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>1</pcpu_id>
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 19e185aab..c2c5f414c 100644
--- a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
@@ -70,7 +70,7 @@
         <vm_type>PRE_STD_VM</vm_type>
         <name>ACRN PRE-LAUNCHED VM0</name>
         <guest_flags>
-            <guest_flag/>
+            <guest_flag></guest_flag>
         </guest_flags>
         <cpu_affinity>
             <pcpu_id>0</pcpu_id>
diff --git a/misc/config_tools/data/ehl-crb-b/logical_partition.xml b/misc/config_tools/data/ehl-crb-b/logical_partition.xml
index 912bacab5..968a850f3 100644
--- a/misc/config_tools/data/ehl-crb-b/logical_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/logical_partition.xml
@@ -70,8 +70,7 @@
         <vm_type>PRE_STD_VM</vm_type>
         <name>ACRN PRE-LAUNCHED VM0</name>
         <guest_flags>
-            <guest_flag/>
-            <guest_flag/>
+            <guest_flag></guest_flag>
         </guest_flags>
         <cpu_affinity>
             <pcpu_id>0</pcpu_id>
@@ -132,7 +131,7 @@
         <vm_type>PRE_STD_VM</vm_type>
         <name>ACRN PRE-LAUNCHED VM1</name>
         <guest_flags>
-            <guest_flag/>
+            <guest_flag></guest_flag>
         </guest_flags>
         <cpu_affinity>
             <pcpu_id>1</pcpu_id>
diff --git a/misc/config_tools/data/generic_board/logical_partition.xml b/misc/config_tools/data/generic_board/logical_partition.xml
index f3008f651..4006ebdfa 100644
--- a/misc/config_tools/data/generic_board/logical_partition.xml
+++ b/misc/config_tools/data/generic_board/logical_partition.xml
@@ -71,8 +71,7 @@
         <vm_type>PRE_STD_VM</vm_type>
         <name>ACRN PRE-LAUNCHED VM0</name>
         <guest_flags>
-            <guest_flag/>
-            <guest_flag/>
+            <guest_flag></guest_flag>
         </guest_flags>
         <cpu_affinity>
             <pcpu_id>0</pcpu_id>
@@ -133,7 +132,7 @@
         <vm_type>PRE_STD_VM</vm_type>
         <name>ACRN PRE-LAUNCHED VM1</name>
         <guest_flags>
-            <guest_flag/>
+            <guest_flag></guest_flag>
         </guest_flags>
         <cpu_affinity>
             <pcpu_id>1</pcpu_id>
diff --git a/misc/config_tools/data/nuc6cayh/logical_partition.xml b/misc/config_tools/data/nuc6cayh/logical_partition.xml
index 114d8199c..3e1b61f0a 100644
--- a/misc/config_tools/data/nuc6cayh/logical_partition.xml
+++ b/misc/config_tools/data/nuc6cayh/logical_partition.xml
@@ -63,8 +63,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM0</name>
     <guest_flags>
-        <guest_flag/>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>0</pcpu_id>
@@ -125,7 +124,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM1</name>
     <guest_flags>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>1</pcpu_id>
diff --git a/misc/config_tools/data/nuc7i7dnb/logical_partition.xml b/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
index 83ff4fd23..7a39010bf 100644
--- a/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
+++ b/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
@@ -59,8 +59,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM0</name>
     <guest_flags>
-        <guest_flag/>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>0</pcpu_id>
@@ -123,7 +122,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM1</name>
     <guest_flags>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>1</pcpu_id>
diff --git a/misc/config_tools/data/tgl-rvp/logical_partition.xml b/misc/config_tools/data/tgl-rvp/logical_partition.xml
index 4f628cece..ae519608e 100644
--- a/misc/config_tools/data/tgl-rvp/logical_partition.xml
+++ b/misc/config_tools/data/tgl-rvp/logical_partition.xml
@@ -59,8 +59,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM0</name>
     <guest_flags>
-        <guest_flag/>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>0</pcpu_id>
@@ -121,7 +120,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM1</name>
     <guest_flags>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>1</pcpu_id>
diff --git a/misc/config_tools/data/whl-ipc-i5/logical_partition.xml b/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
index 8f54b0c3d..e0c961623 100644
--- a/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
+++ b/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
@@ -59,8 +59,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM0</name>
     <guest_flags>
-        <guest_flag/>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>0</pcpu_id>
@@ -122,7 +121,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM1</name>
     <guest_flags>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>1</pcpu_id>
diff --git a/misc/config_tools/data/whl-ipc-i7/logical_partition.xml b/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
index 2f62a218e..6481022b3 100644
--- a/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
+++ b/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
@@ -59,8 +59,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM0</name>
     <guest_flags>
-        <guest_flag/>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>0</pcpu_id>
@@ -121,7 +120,7 @@
     <vm_type>PRE_STD_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM1</name>
     <guest_flags>
-        <guest_flag/>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>1</pcpu_id>