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 a9c945d99..d320ea403 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
@@ -178,8 +178,26 @@
0
0
+
+ 4096
+
COM Port 1
+
+ 00:02.0 VGA compatible controller: Intel Corporation CoffeeLake-S GT2 [UHD Graphics 630] (rev 02)
+
n
+ Windows OS
+ y
+ n
+
+
+
+
+ WaaG
+
+
+ ./win10-ltsc.img
+
POST_LAUNCHED_VM
@@ -197,7 +215,25 @@
0
0
+
+ 512
+
COM Port 1
n
+ Non-Windows OS
+ y
+ n
+
+
+
+ Virtio console
+ stdio
+
+
+ YaaG
+
+
+ ./YaaG.img
+
diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml
index 92fe3b8bc..7a56666eb 100644
--- a/misc/config_tools/data/generic_board/hybrid_rt.xml
+++ b/misc/config_tools/data/generic_board/hybrid_rt.xml
@@ -153,8 +153,26 @@
0
0
+
+ 4096
+
COM Port 1
+
+ 00:02.0 VGA compatible controller: Intel Corporation TigerLake-LP GT2 [Iris Xe Graphics] (rev 01)
+
n
+ Windows OS
+ y
+ n
+
+
+
+
+ WaaG
+
+
+ ./win10-ltsc.img
+
POST_LAUNCHED_VM
@@ -168,7 +186,25 @@
0
+
+ 512
+
COM Port 1
n
+ Non-Windows OS
+ y
+ n
+
+
+
+ Virtio console
+ stdio
+
+
+ YaaG
+
+
+ ./YaaG.img
+
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 a6cd1b77c..ba63a2a91 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
@@ -133,8 +133,29 @@
0
+
+ 4096
+
COM Port 1
+
+ 00:02.0 VGA compatible controller: Intel Corporation TigerLake-LP GT2 [Iris Xe Graphics] (rev 01)
+
n
+ Windows OS
+ y
+ n
+
+
+
+ Virtio console
+ stdio
+
+
+ WaaG
+
+
+ ./win10-ltsc.img
+
POST_LAUNCHED_VM
@@ -148,7 +169,25 @@
0
+
+ 512
+
COM Port 1
n
+ Non-Windows OS
+ y
+ n
+
+
+
+ Virtio console
+ stdio
+
+
+ YaaG
+
+
+ ./YaaG.img
+
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index 3e1bdcc0d..d79a2f429 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -130,7 +130,58 @@
0
+
+ 4096
+
+ COM Port 1
+
+ 00:02.0 VGA compatible controller: Intel Corporation CoffeeLake-S GT2 [UHD Graphics 630] (rev 02)
+
+ n
+ Windows OS
+ y
+ n
+
+
+
+
+ WaaG
+
+
+ ./win10-ltsc.img
+
+
+
+ POST_LAUNCHED_VM
+ STANDARD_VM
+ POST_STD_VM2
+
+
+ 2
+
+
+
+ 0
+
+
+ 512
+
COM Port 1
n
+ Non-Windows OS
+ y
+ n
+
+
+
+ Virtio console
+ stdio
+
+
+ YaaG
+
+
+ ./YaaG.img
+
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
index 50416fc94..349624471 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
@@ -193,7 +193,25 @@
0
+
+ 512
+
COM Port 1
n
+ Non-Windows OS
+ y
+ n
+
+
+
+ Virtio console
+ stdio
+
+
+ YaaG
+
+
+ ./YaaG.img
+
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
index c49bd5d9d..7728fadd5 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
@@ -98,7 +98,7 @@
n
Windows OS
y
- y
+ n
@@ -175,10 +175,15 @@
n
-
-
+
+ Virtio console
+ stdio
+
+
+ YaaG3
+
-
+ ./YaaG.img
@@ -207,10 +212,15 @@
n
-
-
+
+ Virtio console
+ stdio
+
+
+ YaaG4
+
-
+ ./YaaG.img
@@ -239,10 +249,15 @@
n
-
-
+
+ Virtio console
+ stdio
+
+
+ YaaG5
+
-
+ ./YaaG.img
@@ -271,10 +286,15 @@
n
-
-
+
+ Virtio console
+ stdio
+
+
+ YaaG6
+
-
+ ./YaaG.img