diff --git a/lib/engines/hcktest/platforms/Win10_1607x64.json b/lib/engines/hcktest/platforms/Win10_1607x64.json
index 31e859b5..91656ef4 100644
--- a/lib/engines/hcktest/platforms/Win10_1607x64.json
+++ b/lib/engines/hcktest/platforms/Win10_1607x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HLK1703-C1-Win10_1607x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HLK1703-C2-Win10_1607x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_1607x86.json b/lib/engines/hcktest/platforms/Win10_1607x86.json
index 5794fc56..ab470021 100644
--- a/lib/engines/hcktest/platforms/Win10_1607x86.json
+++ b/lib/engines/hcktest/platforms/Win10_1607x86.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HLK1703-C1-Win10_1607x86.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HLK1703-C2-Win10_1607x86.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_1703x64.json b/lib/engines/hcktest/platforms/Win10_1703x64.json
index 5daa438d..f892fb31 100644
--- a/lib/engines/hcktest/platforms/Win10_1703x64.json
+++ b/lib/engines/hcktest/platforms/Win10_1703x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HLK1703-C1-Win10_1703x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HLK1703-C2-Win10_1703x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_1703x86.json b/lib/engines/hcktest/platforms/Win10_1703x86.json
index 736e02f1..be0ef3cc 100644
--- a/lib/engines/hcktest/platforms/Win10_1703x86.json
+++ b/lib/engines/hcktest/platforms/Win10_1703x86.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HLK1703-C1-Win10_1703x86.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HLK1703-C2-Win10_1703x86.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_1709x64.json b/lib/engines/hcktest/platforms/Win10_1709x64.json
index f5a0bd9a..970e98fc 100644
--- a/lib/engines/hcktest/platforms/Win10_1709x64.json
+++ b/lib/engines/hcktest/platforms/Win10_1709x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HLK1709-C1-Win10_1709x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HLK1709-C2-Win10_1709x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_1709x86.json b/lib/engines/hcktest/platforms/Win10_1709x86.json
index 3897c03e..48045782 100644
--- a/lib/engines/hcktest/platforms/Win10_1709x86.json
+++ b/lib/engines/hcktest/platforms/Win10_1709x86.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HLK1709-C1-Win10_1709x86.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HLK1709-C2-Win10_1709x86.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_1803x64.json b/lib/engines/hcktest/platforms/Win10_1803x64.json
index 2fa46b11..e45f5270 100644
--- a/lib/engines/hcktest/platforms/Win10_1803x64.json
+++ b/lib/engines/hcktest/platforms/Win10_1803x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HLK1803-C1-Win10_1803x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HLK1803-C2-Win10_1803x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_1803x86.json b/lib/engines/hcktest/platforms/Win10_1803x86.json
index 01275a5e..a58e7a02 100644
--- a/lib/engines/hcktest/platforms/Win10_1803x86.json
+++ b/lib/engines/hcktest/platforms/Win10_1803x86.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HLK1803-C1-Win10_1803x86.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HLK1803-C2-Win10_1803x86.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_1809x64.json b/lib/engines/hcktest/platforms/Win10_1809x64.json
index 17dc500b..375652f7 100644
--- a/lib/engines/hcktest/platforms/Win10_1809x64.json
+++ b/lib/engines/hcktest/platforms/Win10_1809x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4002",
       "image": "HLK1809-C1-Win10_1809x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4003",
       "image": "HLK1809-C2-Win10_1809x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_1809x86.json b/lib/engines/hcktest/platforms/Win10_1809x86.json
index 11ee2c85..3323751a 100644
--- a/lib/engines/hcktest/platforms/Win10_1809x86.json
+++ b/lib/engines/hcktest/platforms/Win10_1809x86.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4002",
       "image": "HLK1809-C1-Win10_1809x86.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4003",
       "image": "HLK1809-C2-Win10_1809x86.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_1903x64.json b/lib/engines/hcktest/platforms/Win10_1903x64.json
index 966e4ec8..4f6168d3 100644
--- a/lib/engines/hcktest/platforms/Win10_1903x64.json
+++ b/lib/engines/hcktest/platforms/Win10_1903x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HLK1903-C1-Win10_1903x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HLK1903-C2-Win10_1903x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_1903x64_q35.json b/lib/engines/hcktest/platforms/Win10_1903x64_q35.json
index 544bb46f..c65f49cb 100644
--- a/lib/engines/hcktest/platforms/Win10_1903x64_q35.json
+++ b/lib/engines/hcktest/platforms/Win10_1903x64_q35.json
@@ -8,14 +8,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "8",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4002",
       "image": "HLK1903-C1-Win10_1903x64_q35.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "8",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4003",
       "image": "HLK1903-C2-Win10_1903x64_q35.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_1903x64_q35_viommu.json b/lib/engines/hcktest/platforms/Win10_1903x64_q35_viommu.json
index 7347b09a..3f176f3f 100644
--- a/lib/engines/hcktest/platforms/Win10_1903x64_q35_viommu.json
+++ b/lib/engines/hcktest/platforms/Win10_1903x64_q35_viommu.json
@@ -11,14 +11,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "8",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4002",
       "image": "HLK1903-C1-Win10_1903x64_q35.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "8",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4003",
       "image": "HLK1903-C2-Win10_1903x64_q35.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_1903x86.json b/lib/engines/hcktest/platforms/Win10_1903x86.json
index 29bd0051..c1fa0159 100644
--- a/lib/engines/hcktest/platforms/Win10_1903x86.json
+++ b/lib/engines/hcktest/platforms/Win10_1903x86.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HLK1903-C1-Win10_1903x86.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HLK1903-C2-Win10_1903x86.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_2004x64.json b/lib/engines/hcktest/platforms/Win10_2004x64.json
index f45bc871..a3352a96 100644
--- a/lib/engines/hcktest/platforms/Win10_2004x64.json
+++ b/lib/engines/hcktest/platforms/Win10_2004x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "4G",
+      "memory_gb": 4,
       "winrm_port": "4002",
       "image": "HLK2004-C1-Win10_2004x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "4G",
+      "memory_gb": 4,
       "winrm_port": "4003",
       "image": "HLK2004-C2-Win10_2004x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win10_2004x86.json b/lib/engines/hcktest/platforms/Win10_2004x86.json
index 4fe39540..cac8ecd9 100644
--- a/lib/engines/hcktest/platforms/Win10_2004x86.json
+++ b/lib/engines/hcktest/platforms/Win10_2004x86.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "4G",
+      "memory_gb": 4,
       "winrm_port": "4002",
       "image": "HLK2004-C1-Win10_2004x86.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "4G",
+      "memory_gb": 4,
       "winrm_port": "4003",
       "image": "HLK2004-C2-Win10_2004x86.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win11_22H2x64_host_uefi_q35_viommu.json b/lib/engines/hcktest/platforms/Win11_22H2x64_host_uefi_q35_viommu.json
index 3fbe123d..68590812 100644
--- a/lib/engines/hcktest/platforms/Win11_22H2x64_host_uefi_q35_viommu.json
+++ b/lib/engines/hcktest/platforms/Win11_22H2x64_host_uefi_q35_viommu.json
@@ -12,14 +12,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4002",
       "image": "HLK11_22H2-C1-Win11_22H2x64-uefi-q35-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4003",
       "image": "HLK11_22H2-C2-Win11_22H2x64-uefi-q35-viommu.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win11nextx64_host_uefi_q35_viommu.json b/lib/engines/hcktest/platforms/Win11nextx64_host_uefi_q35_viommu.json
index 568a0190..34919eb2 100644
--- a/lib/engines/hcktest/platforms/Win11nextx64_host_uefi_q35_viommu.json
+++ b/lib/engines/hcktest/platforms/Win11nextx64_host_uefi_q35_viommu.json
@@ -12,14 +12,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4002",
       "image": "HLK11_next-C1-Win11nextx64-uefi-q35-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4003",
       "image": "HLK11_next-C2-Win11nextx64-uefi-q35-viommu.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win2008R2x64.json b/lib/engines/hcktest/platforms/Win2008R2x64.json
index 690c7d8e..5e0ba3c6 100644
--- a/lib/engines/hcktest/platforms/Win2008R2x64.json
+++ b/lib/engines/hcktest/platforms/Win2008R2x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HCK-C1-Win2008R2x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HCK-C2-Win2008R2x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win2012R2x64.json b/lib/engines/hcktest/platforms/Win2012R2x64.json
index f30b7465..e36b97c8 100644
--- a/lib/engines/hcktest/platforms/Win2012R2x64.json
+++ b/lib/engines/hcktest/platforms/Win2012R2x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HCK-C1-Win2012R2x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HCK-C2-Win2012R2x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win2012x64.json b/lib/engines/hcktest/platforms/Win2012x64.json
index 390cf92e..d2d64fa3 100644
--- a/lib/engines/hcktest/platforms/Win2012x64.json
+++ b/lib/engines/hcktest/platforms/Win2012x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HCK-C1-Win2012x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HCK-C2-Win2012x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win2016x64.json b/lib/engines/hcktest/platforms/Win2016x64.json
index 0e565c88..29375d94 100644
--- a/lib/engines/hcktest/platforms/Win2016x64.json
+++ b/lib/engines/hcktest/platforms/Win2016x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HLK1607-C1-Win2016x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HLK1607-C2-Win2016x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win2016x64_uefi.json b/lib/engines/hcktest/platforms/Win2016x64_uefi.json
index 7e0c97f4..b02f4896 100644
--- a/lib/engines/hcktest/platforms/Win2016x64_uefi.json
+++ b/lib/engines/hcktest/platforms/Win2016x64_uefi.json
@@ -9,14 +9,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HLK1607-C1-Win2016x64-uefi.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HLK1607-C2-Win2016x64-uefi.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win2019x64.json b/lib/engines/hcktest/platforms/Win2019x64.json
index 6ea01ec8..5b12ec52 100644
--- a/lib/engines/hcktest/platforms/Win2019x64.json
+++ b/lib/engines/hcktest/platforms/Win2019x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4002",
       "image": "HLK1809-C1-Win2019x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4003",
       "image": "HLK1809-C2-Win2019x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win2019x64_uefi.json b/lib/engines/hcktest/platforms/Win2019x64_uefi.json
index 73ac32a0..2059615f 100644
--- a/lib/engines/hcktest/platforms/Win2019x64_uefi.json
+++ b/lib/engines/hcktest/platforms/Win2019x64_uefi.json
@@ -9,14 +9,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4002",
       "image": "HLK1809-C1-Win2019x64-uefi.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4003",
       "image": "HLK1809-C2-Win2019x64-uefi.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win2022nextx64_host_uefi_q35_viommu.json b/lib/engines/hcktest/platforms/Win2022nextx64_host_uefi_q35_viommu.json
index 8c13d657..5663d4ee 100644
--- a/lib/engines/hcktest/platforms/Win2022nextx64_host_uefi_q35_viommu.json
+++ b/lib/engines/hcktest/platforms/Win2022nextx64_host_uefi_q35_viommu.json
@@ -12,14 +12,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4002",
       "image": "HLK2022_next-C1-Win2022nextx64-host-uefi-q35-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4003",
       "image": "HLK2022_next-C2-Win2022nextx64-host-uefi-q35-viommu.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win2022x64.json b/lib/engines/hcktest/platforms/Win2022x64.json
index fec7ea52..ed3da6c3 100644
--- a/lib/engines/hcktest/platforms/Win2022x64.json
+++ b/lib/engines/hcktest/platforms/Win2022x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4002",
       "image": "HLK2022-C1-Win2022x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4003",
       "image": "HLK2022-C2-Win2022x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win2022x64_host_uefi_q35_viommu.json b/lib/engines/hcktest/platforms/Win2022x64_host_uefi_q35_viommu.json
index 9b19446a..2c18f6de 100644
--- a/lib/engines/hcktest/platforms/Win2022x64_host_uefi_q35_viommu.json
+++ b/lib/engines/hcktest/platforms/Win2022x64_host_uefi_q35_viommu.json
@@ -12,14 +12,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4002",
       "image": "HLK2022-C1-Win2022x64-uefi-q35-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4003",
       "image": "HLK2022-C2-Win2022x64-uefi-q35-viommu.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win2022x64_uefi.json b/lib/engines/hcktest/platforms/Win2022x64_uefi.json
index 8f518cde..c30e57d6 100644
--- a/lib/engines/hcktest/platforms/Win2022x64_uefi.json
+++ b/lib/engines/hcktest/platforms/Win2022x64_uefi.json
@@ -9,14 +9,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4002",
       "image": "HLK2022-C1-Win2022x64-uefi.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "8G",
+      "memory_gb": 8,
       "winrm_port": "4003",
       "image": "HLK2022-C2-Win2022x64-uefi.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win7x64.json b/lib/engines/hcktest/platforms/Win7x64.json
index c2c6df8e..213674d1 100644
--- a/lib/engines/hcktest/platforms/Win7x64.json
+++ b/lib/engines/hcktest/platforms/Win7x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "4G",
+      "memory_gb": 4,
       "winrm_port": "4002",
       "image": "HCK-C1-Win7x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "4G",
+      "memory_gb": 4,
       "winrm_port": "4003",
       "image": "HCK-C2-Win7x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win7x86.json b/lib/engines/hcktest/platforms/Win7x86.json
index a2dbd69d..a4ba2189 100644
--- a/lib/engines/hcktest/platforms/Win7x86.json
+++ b/lib/engines/hcktest/platforms/Win7x86.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HCK-C1-Win7x86.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HCK-C2-Win7x86.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win81x64.json b/lib/engines/hcktest/platforms/Win81x64.json
index 769fe5eb..8c0a3f0b 100644
--- a/lib/engines/hcktest/platforms/Win81x64.json
+++ b/lib/engines/hcktest/platforms/Win81x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HCK-C1-Win81x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HCK-C2-Win81x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win81x86.json b/lib/engines/hcktest/platforms/Win81x86.json
index 4e83c8c5..438f6f6b 100644
--- a/lib/engines/hcktest/platforms/Win81x86.json
+++ b/lib/engines/hcktest/platforms/Win81x86.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HCK-C1-Win81x86.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HCK-C2-Win81x86.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win8x64.json b/lib/engines/hcktest/platforms/Win8x64.json
index 3c6c5b77..c7cc84a5 100644
--- a/lib/engines/hcktest/platforms/Win8x64.json
+++ b/lib/engines/hcktest/platforms/Win8x64.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HCK-C1-Win8x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HCK-C2-Win8x64.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/Win8x86.json b/lib/engines/hcktest/platforms/Win8x86.json
index cad14c65..5efc658e 100644
--- a/lib/engines/hcktest/platforms/Win8x86.json
+++ b/lib/engines/hcktest/platforms/Win8x86.json
@@ -7,14 +7,14 @@
     "c1": {
       "name": "CL1",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4002",
       "image": "HCK-C1-Win8x86.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": "4",
-      "memory": "2G",
+      "memory_gb": 2,
       "winrm_port": "4003",
       "image": "HCK-C2-Win8x86.qcow2"
     }
diff --git a/lib/engines/hcktest/platforms/jtd.json b/lib/engines/hcktest/platforms/jtd.json
index 3e9c458a..92ac5069 100644
--- a/lib/engines/hcktest/platforms/jtd.json
+++ b/lib/engines/hcktest/platforms/jtd.json
@@ -50,7 +50,7 @@
       "properties": {
         "name": { "type": "string" },
         "cpus": { "type": "string" },
-        "memory": { "type": "string" },
+        "memory_gb": { "type": "uint16" },
         "winrm_port": { "type": "string" },
         "image": { "type": "string" }
       }
diff --git a/lib/setupmanagers/qemuhck/qemu_machine.json b/lib/setupmanagers/qemuhck/qemu_machine.json
index a30edb1e..9c3c3673 100644
--- a/lib/setupmanagers/qemuhck/qemu_machine.json
+++ b/lib/setupmanagers/qemuhck/qemu_machine.json
@@ -14,7 +14,7 @@
   "platforms_defaults": {
     "cpu": "qemu64",
     "cpu_count": 2,
-    "memory": "4G",
+    "memory_gb": 4,
     "cpu_model": 13,
     "world_net_device": "e1000e",
     "ctrl_net_device": "e1000e",
diff --git a/lib/setupmanagers/qemuhck/qemu_machine.rb b/lib/setupmanagers/qemuhck/qemu_machine.rb
index 19c2dc80..7d1e9597 100644
--- a/lib/setupmanagers/qemuhck/qemu_machine.rb
+++ b/lib/setupmanagers/qemuhck/qemu_machine.rb
@@ -357,7 +357,7 @@ def full_replacement_list
         '@run_id_second@' => @id_second,
         '@client_id@' => @client_id,
         '@workspace@' => @workspace_path,
-        '@memory@' => option_config('memory'),
+        '@memory@' => "#{option_config('memory_gb')}G",
         '@cpu@' => option_config('cpu'),
         '@cpu_count@' => option_config('cpu_count'),
         '@cpu_model@' => option_config('cpu_model'),
diff --git a/lib/setupmanagers/qemuhck/qemuhck.rb b/lib/setupmanagers/qemuhck/qemuhck.rb
index 308f5705..9ce7d980 100644
--- a/lib/setupmanagers/qemuhck/qemuhck.rb
+++ b/lib/setupmanagers/qemuhck/qemuhck.rb
@@ -98,7 +98,7 @@ def initialize_clients_vm
           'client_id' => i + 1,
           'image_name' => v['image'],
           'cpu_count' => v['cpus'],
-          'memory' => v['memory']
+          'memory_gb' => v['memory_gb']
         }.merge(client_vm_common_options))
         @clients_vm[v['name']] = QemuMachine.new(vm_options)
       end