diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/095-reboot-service.t b/.gitlab/tests/cram/generic/acceleration-plan-components/095-reboot-service.t
index eef4347116..f81e9b5367 100644
--- a/.gitlab/tests/cram/generic/acceleration-plan-components/095-reboot-service.t
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/095-reboot-service.t
@@ -8,63 +8,20 @@ Check the root datamodel settings:
   {
     "Reboot.": {
       "BootCount": 1,
-      "ColdBootCount": 0,
+      "ColdBootCount": 1,
+      "CurrentBootCycle": "Cold",
+      "CurrentVersionBootCount": 1,
       "MaxRebootEntries": 10,
       "RebootNumberOfEntries": 1,
       "WarmBootCount": 0,
-      "WatchdogBootCount": 0,
-      "X_PRPLWARE-COM_CurrentBootCycle": ""
+      "WatchdogBootCount": 0
     },
     "Reboot.Reboot.1.": {
       "Alias": "cpe-Reboot-1",
       "Cause": "LocalFactoryReset",
       "FirmwareUpdated": 0,
-      "Reason": "Initiated by Unknown",
+      "Reason": "Power lost",
       "TimeStamp": "\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d+Z" (re)
-    },
-    "Reboot.X_PRPLWARE-COM_Reasons.1.": {
-      "Alias": "REASON_FIRMWARE_UPGRADE",
-      "Format": "Firmware Upgrade %s"
-    },
-    "Reboot.X_PRPLWARE-COM_Reasons.10.": {
-      "Alias": "REASON_INITIATED_BY_SOURCE",
-      "Format": "Initiated by %s"
-    },
-    "Reboot.X_PRPLWARE-COM_Reasons.11.": {
-      "Alias": "REASON_UNKNOWN",
-      "Format": "Unknown"
-    },
-    "Reboot.X_PRPLWARE-COM_Reasons.2.": {
-      "Alias": "REASON_FIRMWARE_DOWNGRADE",
-      "Format": "Firmware Downgrade %s"
-    },
-    "Reboot.X_PRPLWARE-COM_Reasons.3.": {
-      "Alias": "REASON_POWER_LOST",
-      "Format": "Power lost"
-    },
-    "Reboot.X_PRPLWARE-COM_Reasons.4.": {
-      "Alias": "REASON_OVERHEAT",
-      "Format": "Overheat"
-    },
-    "Reboot.X_PRPLWARE-COM_Reasons.5.": {
-      "Alias": "REASON_AUTOMATIC_PLANNED_REBOOT",
-      "Format": "Automatic planned reboot"
-    },
-    "Reboot.X_PRPLWARE-COM_Reasons.6.": {
-      "Alias": "REASON_USERSPACE_CRASH",
-      "Format": "Userspace crash in %s %s"
-    },
-    "Reboot.X_PRPLWARE-COM_Reasons.7.": {
-      "Alias": "REASON_KERNEL_CRASH",
-      "Format": "Kernel crash %s"
-    },
-    "Reboot.X_PRPLWARE-COM_Reasons.8.": {
-      "Alias": "REASON_HARDWARE_WATCHDOG",
-      "Format": "Hardware watchdog %s"
-    },
-    "Reboot.X_PRPLWARE-COM_Reasons.9.": {
-      "Alias": "REASON_CRASH_LOOP_PROTECTION_DETECTION",
-      "Format": "Crash loop Protection detected on %s %s"
     }
   }
 
@@ -79,11 +36,12 @@ Check if counters are flushed:
   {
     "Reboot.": {
       "BootCount": 1,
-      "ColdBootCount": 0,
+      "ColdBootCount": 1,
+      "CurrentBootCycle": "Cold",
+      "CurrentVersionBootCount": 1,
       "MaxRebootEntries": 10,
       "RebootNumberOfEntries": 0,
       "WarmBootCount": 0,
-      "WatchdogBootCount": 0,
-      "X_PRPLWARE-COM_CurrentBootCycle": ""
+      "WatchdogBootCount": 0
     }
   }