diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 130a17a353064408811d60f7d823ce0ea76ddb64..3c6885f60cd5f4b6595f3f3f90a7e58365a07d53 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -46,6 +46,7 @@
+
diff --git a/src/cpu_map/x86_Cascadelake-Server.xml b/src/cpu_map/x86_Cascadelake-Server.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7c7fc92c407e848c1bb86291ad92dcb163fe8da5
--- /dev/null
+++ b/src/cpu_map/x86_Cascadelake-Server.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
index 6991b40af8eeb05ddf1e962c02b0444b6b24204d..cc1fc90c4553f404c70529ffe82e2f284ae18a95 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
@@ -1,5 +1,5 @@
- Skylake-Server-IBRS
+ Cascadelake-Server
Intel
@@ -20,14 +20,11 @@
-
-
-
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
index 90ac6edb149d8679290856e402c7e1714e85d851..dfabdc57c70545349aa32b3af8cdefbb0e46930b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
@@ -1,6 +1,6 @@
x86_64
- Skylake-Server-IBRS
+ Cascadelake-Server
Intel
@@ -21,14 +21,11 @@
-
-
-
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
index 12431de213bb50a51ffcee486047873e2bfe8275..b7d12dced7058f0060ef7761e553a2bf10d4406f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
@@ -1,13 +1,10 @@
- Skylake-Server-IBRS
+ Cascadelake-Server
Intel
-
-
-
diff --git a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
index f38a098a3d3534991160f0c3ea3d2e314acb3bfe..ca3baab88c607da471b092c8b2bb61d463731ef4 100644
--- a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
@@ -83,6 +83,7 @@
EPYC-IBPB
EPYC
Conroe
+ Cascadelake-Server
Broadwell-noTSX-IBRS
Broadwell-noTSX
Broadwell-IBRS
diff --git a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
index ef8184c06bc55fc19f45a70bc247e8c33738f751..42d8949e61a68dcea4904e94b936d9b4b8abb09e 100644
--- a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
@@ -83,6 +83,7 @@
EPYC-IBPB
EPYC
Conroe
+ Cascadelake-Server
Broadwell-noTSX-IBRS
Broadwell-noTSX
Broadwell-IBRS