diff --git a/.buildkite/pipeline_cpu_template.py b/.buildkite/pipeline_cpu_template.py
index 042693c185c..312f9061ed1 100755
--- a/.buildkite/pipeline_cpu_template.py
+++ b/.buildkite/pipeline_cpu_template.py
@@ -88,16 +88,18 @@ def group_snapshot_restore(test_step):
     groups = []
 
     groups.append(
-        group(
-            label=test_step["snapshot"][BkStep.LABEL],
-            command=test_step["snapshot"][BkStep.COMMAND],
-            instances=test_step["instances"],
-            platforms=DEFAULT_PLATFORMS,
-            timeout=test_step["snapshot"][BkStep.TIMEOUT],
-            artifacts=test_step["snapshot"][BkStep.ARTIFACTS],
-        )
+        {
+            "key": "snapshot",
+            **group(
+                label=test_step["snapshot"][BkStep.LABEL],
+                command=test_step["snapshot"][BkStep.COMMAND],
+                instances=test_step["instances"],
+                platforms=DEFAULT_PLATFORMS,
+                timeout=test_step["snapshot"][BkStep.TIMEOUT],
+                artifacts=test_step["snapshot"][BkStep.ARTIFACTS],
+            ),
+        }
     )
-    groups.append("wait")
     snapshot_restore_combinations = []
     for dp in DEFAULT_PLATFORMS:
         for src_instance in test_step["instances"]:
@@ -137,7 +139,9 @@ def group_snapshot_restore(test_step):
             }
         )
 
-    groups.append({"group": "📸 restores snapshots", "steps": steps})
+    groups.append(
+        {"group": "📸 restores snapshots", "steps": steps, "depends_on": "snapshot"}
+    )
     return groups
 
 
diff --git a/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V2_6.1host.json b/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V2_6.1host.json
index 2e05a08356c..4efb9a27b56 100644
--- a/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V2_6.1host.json
+++ b/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V2_6.1host.json
@@ -1,6 +1,6 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "6.1.129-138.220.amzn2023.aarch64",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "6.1.140-154.222.amzn2023.aarch64",
   "microcode_version": "0x0000000000000017",
   "bios_version": "1.0",
   "bios_revision": "1.0",
@@ -834,7 +834,7 @@
       },
       {
         "addr": "0x6030000000140003",
-        "bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010"
+        "bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001"
       },
       {
         "addr": "0x6030000000160000",
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 38855ec24cc..210828b5cd1 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,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "6.1.129-138.220.amzn2023.x86_64",
-  "microcode_version": "0x2b000620",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "6.1.140-154.222.amzn2023.x86_64",
+  "microcode_version": "0x2b000639",
   "bios_version": "1.0",
-  "bios_revision": "3.3",
+  "bios_revision": "3.10",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -1431,7 +1431,7 @@
       },
       {
         "addr": "0x10a",
-        "bitmap": "0b0000000000000000000000000000000000001100000010001110000011101011"
+        "bitmap": "0b0100000000000000000000000000000000001100000010001110000011101011"
       },
       {
         "addr": "0x140",
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 432a97f64bc..d4a6cca8d19 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.12.0-dev",
-  "kernel_version": "6.1.129-138.220.amzn2023.x86_64",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "6.1.140-154.222.amzn2023.x86_64",
   "microcode_version": "0x2007006",
   "bios_version": "1.0",
-  "bios_revision": "4.11",
+  "bios_revision": "4.13",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -1128,7 +1128,7 @@
       },
       {
         "addr": "0x10a",
-        "bitmap": "0b0000000000000000000000000000000000001100000000000000000001001100"
+        "bitmap": "0b0100000000000000000000000000000000001100000000000000000001001100"
       },
       {
         "addr": "0x140",
diff --git a/tests/data/msr/msr_list_SPR_TO_T2_6.1_INTEL_SAPPHIRE_RAPIDS_6.1host_5.10guest.csv b/tests/data/msr/msr_list_SPR_TO_T2_6.1_INTEL_SAPPHIRE_RAPIDS_6.1host_5.10guest.csv
index cac2bf0c798..b9eb3de2a59 100644
--- a/tests/data/msr/msr_list_SPR_TO_T2_6.1_INTEL_SAPPHIRE_RAPIDS_6.1host_5.10guest.csv
+++ b/tests/data/msr/msr_list_SPR_TO_T2_6.1_INTEL_SAPPHIRE_RAPIDS_6.1host_5.10guest.csv
@@ -1,7 +1,7 @@
 MSR_ADDR,VALUE
 0x0,0x0
 0x1,0x0
-0x10,0xbae96682
+0x10,0x7c90dcf2
 0x11,0x24a1008
 0x12,0x24a2001
 0x17,0x0
@@ -18,7 +18,7 @@ MSR_ADDR,VALUE
 0xcd,0x3
 0xce,0x80000000
 0xfe,0x508
-0x10a,0xc08e0eb
+0x10a,0x400000000c08e0eb
 0x11e,0xbe702111
 0x122,0x3
 0x140,0x0
@@ -200,7 +200,7 @@ MSR_ADDR,VALUE
 0x619,0x0
 0x639,0x0
 0x641,0x0
-0x6e0,0x18e92c0b0
+0x6e0,0x7d409184
 0x800,0x0
 0x801,0x0
 0x802,0x0
@@ -462,7 +462,7 @@ MSR_ADDR,VALUE
 0xc0000082,0xffffffff81a00080
 0xc0000083,0xffffffff81a015c0
 0xc0000084,0x47700
-0xc0000100,0x7f1687b37740
+0xc0000100,0x3d11f380
 0xc0000101,0xffff88803ec00000
 0xc0000102,0x0
 0xc0000103,0x0
diff --git a/tests/data/msr/msr_list_SPR_TO_T2_6.1_INTEL_SAPPHIRE_RAPIDS_6.1host_6.1guest.csv b/tests/data/msr/msr_list_SPR_TO_T2_6.1_INTEL_SAPPHIRE_RAPIDS_6.1host_6.1guest.csv
index 7dbb5f0ddcb..d8e39b1d2fb 100644
--- a/tests/data/msr/msr_list_SPR_TO_T2_6.1_INTEL_SAPPHIRE_RAPIDS_6.1host_6.1guest.csv
+++ b/tests/data/msr/msr_list_SPR_TO_T2_6.1_INTEL_SAPPHIRE_RAPIDS_6.1host_6.1guest.csv
@@ -1,7 +1,7 @@
 MSR_ADDR,VALUE
 0x0,0x0
 0x1,0x0
-0x10,0x7b423550
+0x10,0x6f38b066
 0x11,0x25cb008
 0x12,0x25cc001
 0x17,0x0
@@ -18,7 +18,7 @@ MSR_ADDR,VALUE
 0xcd,0x3
 0xce,0x80000000
 0xfe,0x508
-0x10a,0xc08e0eb
+0x10a,0x400000000c08e0eb
 0x11e,0xbe702111
 0x122,0x3
 0x140,0x0
@@ -200,7 +200,7 @@ MSR_ADDR,VALUE
 0x619,0x0
 0x639,0x0
 0x641,0x0
-0x6e0,0x162fb7dfe
+0x6e0,0x6f8e7c12
 0x800,0x0
 0x801,0x0
 0x802,0x0
@@ -462,7 +462,7 @@ MSR_ADDR,VALUE
 0xc0000082,0xffffffff81a00080
 0xc0000083,0x0
 0xc0000084,0x257fd5
-0xc0000100,0x7fbb7b0e1740
+0xc0000100,0x14cb9380
 0xc0000101,0xffff88803ec00000
 0xc0000102,0x0
 0xc0000103,0x0