diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_GENOA_5.10host.json b/tests/data/cpu_template_helper/fingerprint_AMD_GENOA_5.10host.json
index 7b835e165b8..0819f3941ee 100644
--- a/tests/data/cpu_template_helper/fingerprint_AMD_GENOA_5.10host.json
+++ b/tests/data/cpu_template_helper/fingerprint_AMD_GENOA_5.10host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "5.10.234-225.910.amzn2.x86_64",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "5.10.238-234.956.amzn2.x86_64",
   "microcode_version": "0xa101154",
   "bios_version": "1.0",
-  "bios_revision": "2.19",
+  "bios_revision": "2.21",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -666,7 +666,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000110000000000001111110111"
+            "bitmap": "0b00000000110000000000001111110011"
           },
           {
             "register": "edx",
@@ -865,11 +865,11 @@
         "modifiers": [
           {
             "register": "eax",
-            "bitmap": "0b00000000000000000000000000000001"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ebx",
-            "bitmap": "0b00000000000000000000000000001000"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ecx",
@@ -877,7 +877,7 @@
           },
           {
             "register": "edx",
-            "bitmap": "0b00000000000000000000000000001001"
+            "bitmap": "0b00000000000000000000000000000000"
           }
         ]
       },
diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_GENOA_6.1host.json b/tests/data/cpu_template_helper/fingerprint_AMD_GENOA_6.1host.json
index 0a096b62831..4aab22a404d 100644
--- a/tests/data/cpu_template_helper/fingerprint_AMD_GENOA_6.1host.json
+++ b/tests/data/cpu_template_helper/fingerprint_AMD_GENOA_6.1host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "6.1.129-138.220.amzn2023.x86_64",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "6.1.141-165.249.amzn2023.x86_64",
   "microcode_version": "0xa101154",
   "bios_version": "1.0",
-  "bios_revision": "2.19",
+  "bios_revision": "2.21",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -666,7 +666,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000110000000000001111110111"
+            "bitmap": "0b00000000110000000000001111110011"
           },
           {
             "register": "edx",
@@ -865,11 +865,11 @@
         "modifiers": [
           {
             "register": "eax",
-            "bitmap": "0b00000000000000000000000000000001"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ebx",
-            "bitmap": "0b00000000000000000000000000001000"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ecx",
@@ -877,7 +877,7 @@
           },
           {
             "register": "edx",
-            "bitmap": "0b00010000000000011001010000111011"
+            "bitmap": "0b00000000000000000000000000000000"
           }
         ]
       },
diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json
index d24260ad7fa..94ce1f5cc3a 100644
--- a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json
+++ b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "5.10.234-225.910.amzn2.x86_64",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "5.10.238-234.956.amzn2.x86_64",
   "microcode_version": "0xa0011db",
   "bios_version": "1.0",
-  "bios_revision": "0.90",
+  "bios_revision": "0.94",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -574,7 +574,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000110000000000001111110111"
+            "bitmap": "0b00000000110000000000001111110011"
           },
           {
             "register": "edx",
@@ -773,11 +773,11 @@
         "modifiers": [
           {
             "register": "eax",
-            "bitmap": "0b00000000000000000000000000000001"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ebx",
-            "bitmap": "0b00000000000000000000000000001000"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ecx",
@@ -785,7 +785,7 @@
           },
           {
             "register": "edx",
-            "bitmap": "0b00000000000000000000000000001001"
+            "bitmap": "0b00000000000000000000000000000000"
           }
         ]
       },
diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json
index 5dca6763099..510d2c5d4fe 100644
--- a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json
+++ b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "6.1.129-138.220.amzn2023.x86_64",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "6.1.141-165.249.amzn2023.x86_64",
   "microcode_version": "0xa0011db",
   "bios_version": "1.0",
-  "bios_revision": "0.90",
+  "bios_revision": "0.94",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -574,7 +574,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000110000000000001111110111"
+            "bitmap": "0b00000000110000000000001111110011"
           },
           {
             "register": "edx",
@@ -773,11 +773,11 @@
         "modifiers": [
           {
             "register": "eax",
-            "bitmap": "0b00000000000000000000000000000001"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ebx",
-            "bitmap": "0b00000000000000000000000000001000"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ecx",
@@ -785,7 +785,7 @@
           },
           {
             "register": "edx",
-            "bitmap": "0b00010000000000011001010000111011"
+            "bitmap": "0b00000000000000000000000000000000"
           }
         ]
       },
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json
index 45e3d7ed4b8..f049c33a044 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "5.10.234-225.910.amzn2.x86_64",
-  "microcode_version": "0x5003801",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "5.10.238-234.956.amzn2.x86_64",
+  "microcode_version": "0x5003901",
   "bios_version": "1.0",
-  "bios_revision": "4.11",
+  "bios_revision": "4.13",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json
index 1dc7abee252..fc9bb28157d 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "6.1.129-138.220.amzn2023.x86_64",
-  "microcode_version": "0x5003801",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "6.1.141-165.249.amzn2023.x86_64",
+  "microcode_version": "0x5003901",
   "bios_version": "1.0",
-  "bios_revision": "4.11",
+  "bios_revision": "4.13",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json
index 5bf57d51da9..6ccceb86fd1 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "5.10.234-225.910.amzn2.x86_64",
-  "microcode_version": "0xd0003f6",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "5.10.238-234.956.amzn2.x86_64",
+  "microcode_version": "0xd000404",
   "bios_version": "1.0",
-  "bios_revision": "1.40",
+  "bios_revision": "1.41",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json
index 05dea2e484a..b803c54e93c 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "6.1.129-138.220.amzn2023.x86_64",
-  "microcode_version": "0xd0003f6",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "6.1.141-165.249.amzn2023.x86_64",
+  "microcode_version": "0xd000404",
   "bios_version": "1.0",
-  "bios_revision": "1.40",
+  "bios_revision": "1.41",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100111"
+            "bitmap": "0b11110111111110100011001000000111"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_5.10host.json
index b5015feaf2e..924139529ec 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_5.10host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_5.10host.json
@@ -1,6 +1,6 @@
 {
   "firecracker_version": "1.13.0-dev",
-  "kernel_version": "5.10.237-230.948.amzn2.x86_64",
+  "kernel_version": "5.10.238-234.956.amzn2.x86_64",
   "microcode_version": "0x2b000639",
   "bios_version": "1.0",
   "bios_revision": "3.10",
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_6.1host.json
index 210828b5cd1..2d63f85c55a 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_6.1host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_6.1host.json
@@ -1,6 +1,6 @@
 {
   "firecracker_version": "1.13.0-dev",
-  "kernel_version": "6.1.140-154.222.amzn2023.x86_64",
+  "kernel_version": "6.1.141-165.249.amzn2023.x86_64",
   "microcode_version": "0x2b000639",
   "bios_version": "1.0",
   "bios_revision": "3.10",
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json
index 7076b646f80..ce346c88a28 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json
@@ -1,9 +1,9 @@
 {
   "firecracker_version": "1.13.0-dev",
-  "kernel_version": "5.10.237-230.948.amzn2.x86_64",
+  "kernel_version": "5.10.238-234.956.amzn2.x86_64",
   "microcode_version": "0x2007006",
   "bios_version": "1.0",
-  "bios_revision": "4.13",
+  "bios_revision": "4.14",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json
index d4a6cca8d19..87c941f3a04 100644
--- a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json
+++ b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json
@@ -1,9 +1,9 @@
 {
   "firecracker_version": "1.13.0-dev",
-  "kernel_version": "6.1.140-154.222.amzn2023.x86_64",
+  "kernel_version": "6.1.141-165.249.amzn2023.x86_64",
   "microcode_version": "0x2007006",
   "bios_version": "1.0",
-  "bios_revision": "4.13",
+  "bios_revision": "4.14",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/msr/msr_list_T2A_AMD_MILAN_6.1host_5.10guest.csv b/tests/data/msr/msr_list_T2A_AMD_MILAN_6.1host_5.10guest.csv
index 6cb0f751fe2..b7e64457995 100644
--- a/tests/data/msr/msr_list_T2A_AMD_MILAN_6.1host_5.10guest.csv
+++ b/tests/data/msr/msr_list_T2A_AMD_MILAN_6.1host_5.10guest.csv
@@ -1,9 +1,9 @@
 MSR_ADDR,VALUE
 0x0,0x0
 0x1,0x0
-0x10,0xd2adc3c4
-0x11,0x2a00000
-0x12,0x2a01001
+0x10,0x91048477
+0x11,0x24a1008
+0x12,0x24a2001
 0x17,0x0
 0x1b,0xfee00d00
 0x2a,0x0
@@ -21,7 +21,7 @@ MSR_ADDR,VALUE
 0x140,0x0
 0x174,0x10
 0x175,0x3000
-0x176,0x81801370
+0x176,0x81a01510
 0x179,0x20
 0x17a,0x0
 0x186,0x0
@@ -197,7 +197,7 @@ MSR_ADDR,VALUE
 0x619,0x0
 0x639,0x0
 0x641,0x0
-0x6e0,0x1834261cf
+0x6e0,0x91ac122f
 0x802,0x0
 0x803,0x50014
 0x808,0x10
@@ -241,14 +241,13 @@ MSR_ADDR,VALUE
 0x83e,0x0
 0xc0000080,0xd01
 0xc0000081,0x23001000000000
-0xc0000082,0xffffffff81800000
-0xc0000083,0xffffffff81801400
+0xc0000082,0xffffffff81a00080
+0xc0000083,0xffffffff81a015c0
 0xc0000084,0x47700
-0xc0000100,0x7f99e723c500
+0xc0000100,0x369e2380
 0xc0000101,0xffff88803ec00000
 0xc0000102,0x0
 0xc0000103,0x0
-0xc0000104,0x100000000
 0xc0010000,0x0
 0xc0010001,0x0
 0xc0010002,0x0
diff --git a/tests/data/msr/msr_list_T2A_AMD_MILAN_6.1host_6.1guest.csv b/tests/data/msr/msr_list_T2A_AMD_MILAN_6.1host_6.1guest.csv
index 42826e177c3..9d40e380ef1 100644
--- a/tests/data/msr/msr_list_T2A_AMD_MILAN_6.1host_6.1guest.csv
+++ b/tests/data/msr/msr_list_T2A_AMD_MILAN_6.1host_6.1guest.csv
@@ -1,9 +1,9 @@
 MSR_ADDR,VALUE
 0x0,0x0
 0x1,0x0
-0x10,0xd2adc3c4
-0x11,0x2a00000
-0x12,0x2a01001
+0x10,0x8ae2ee59
+0x11,0x25cb008
+0x12,0x25cc001
 0x17,0x0
 0x1b,0xfee00d00
 0x2a,0x0
@@ -21,7 +21,7 @@ MSR_ADDR,VALUE
 0x140,0x0
 0x174,0x10
 0x175,0x3000
-0x176,0x81801370
+0x176,0x81a01620
 0x179,0x20
 0x17a,0x0
 0x186,0x0
@@ -197,7 +197,7 @@ MSR_ADDR,VALUE
 0x619,0x0
 0x639,0x0
 0x641,0x0
-0x6e0,0x1834261cf
+0x6e0,0x8b556120
 0x802,0x0
 0x803,0x50014
 0x808,0x10
@@ -241,14 +241,13 @@ MSR_ADDR,VALUE
 0x83e,0x0
 0xc0000080,0xd01
 0xc0000081,0x23001000000000
-0xc0000082,0xffffffff81800000
-0xc0000083,0xffffffff81801400
+0xc0000082,0xffffffff81a00080
+0xc0000083,0xffffffff81a016e0
 0xc0000084,0x257fd5
-0xc0000100,0x7f99e723c500
+0xc0000100,0x3279380
 0xc0000101,0xffff88803ec00000
 0xc0000102,0x0
 0xc0000103,0x0
-0xc0000104,0x100000000
 0xc0010000,0x0
 0xc0010001,0x0
 0xc0010002,0x0