diff --git a/buildroot-external/board/pc/generic-x86-64/hassos-hook.sh b/buildroot-external/board/pc/generic-x86-64/hassos-hook.sh
index f64466167..dfac639ae 100755
--- a/buildroot-external/board/pc/generic-x86-64/hassos-hook.sh
+++ b/buildroot-external/board/pc/generic-x86-64/hassos-hook.sh
@@ -9,6 +9,8 @@ function hassos_pre_image() {
 
     cp "${BINARIES_DIR}/barebox.bin" "${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI"
     cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi.dtb" "${BOOT_DATA}/EFI/barebox/state.dtb"
+    cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi-A.dtb" "${BOOT_DATA}/EFI/barebox/state-A.dtb"
+    cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi-B.dtb" "${BOOT_DATA}/EFI/barebox/state-B.dtb"
     cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
 }
 
diff --git a/buildroot-external/board/pc/ova/hassos-hook.sh b/buildroot-external/board/pc/ova/hassos-hook.sh
index 4f2278a9c..afc9d4cfb 100755
--- a/buildroot-external/board/pc/ova/hassos-hook.sh
+++ b/buildroot-external/board/pc/ova/hassos-hook.sh
@@ -9,6 +9,8 @@ function hassos_pre_image() {
 
     cp "${BINARIES_DIR}/barebox.bin" "${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI"
     cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi.dtb" "${BOOT_DATA}/EFI/barebox/state.dtb"
+    cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi-A.dtb" "${BOOT_DATA}/EFI/barebox/state-A.dtb"
+    cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi-B.dtb" "${BOOT_DATA}/EFI/barebox/state-B.dtb"
     cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
 }
 
diff --git a/buildroot-external/bootloader/barebox-state-efi-A.dtb b/buildroot-external/bootloader/barebox-state-efi-A.dtb
new file mode 100644
index 000000000..e26c07071
Binary files /dev/null and b/buildroot-external/bootloader/barebox-state-efi-A.dtb differ
diff --git a/buildroot-external/bootloader/barebox-state-efi-A.dts b/buildroot-external/bootloader/barebox-state-efi-A.dts
new file mode 100644
index 000000000..8d2705f8e
--- /dev/null
+++ b/buildroot-external/bootloader/barebox-state-efi-A.dts
@@ -0,0 +1,76 @@
+/dts-v1/;
+/ {
+
+	aliases {
+		state = &state;
+	};
+
+	state: state {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		
+		magic = <0xef98423f>;
+		compatible = "barebox,state";
+		backend = <&backend_state>;
+		backend-type = "raw";
+		backend-stridesize = <4048>;
+
+		bootstate {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			A {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				remaining_attempts@0 {
+					reg = <0x0 0x4>;
+					type = "uint32";
+					default = <3>;
+				};
+				priority@4 {
+					reg = <0x4 0x4>;
+					type = "uint32";
+					default = <20>;
+				};
+			};
+
+			B {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				remaining_attempts@8 {
+					reg = <0x8 0x4>;
+					type = "uint32";
+					default = <0>;
+				};
+				priority@c {
+					reg = <0xc 0x4>;
+					type = "uint32";
+					default = <10>;
+				};
+			};
+
+			last_chosen@10 {
+				reg = <0x10 0x4>;
+				type = "uint32";
+			};
+		};
+
+		machine_id@14 {
+			reg = <0x14 0x24>;
+			type = "string";
+			default = "";
+		};
+	};
+
+	partitions {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "fixed-partitions";
+
+		backend_state: state {
+			partuuid = "33236519-7f32-4dff-8002-3390b62c309d";
+		};
+	};
+
+};
+
diff --git a/buildroot-external/bootloader/barebox-state-efi-B.dtb b/buildroot-external/bootloader/barebox-state-efi-B.dtb
new file mode 100644
index 000000000..8b96079bd
Binary files /dev/null and b/buildroot-external/bootloader/barebox-state-efi-B.dtb differ
diff --git a/buildroot-external/bootloader/barebox-state-efi-B.dts b/buildroot-external/bootloader/barebox-state-efi-B.dts
new file mode 100644
index 000000000..d861a9488
--- /dev/null
+++ b/buildroot-external/bootloader/barebox-state-efi-B.dts
@@ -0,0 +1,76 @@
+/dts-v1/;
+/ {
+
+	aliases {
+		state = &state;
+	};
+
+	state: state {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		
+		magic = <0xef98423f>;
+		compatible = "barebox,state";
+		backend = <&backend_state>;
+		backend-type = "raw";
+		backend-stridesize = <4048>;
+
+		bootstate {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			A {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				remaining_attempts@0 {
+					reg = <0x0 0x4>;
+					type = "uint32";
+					default = <3>;
+				};
+				priority@4 {
+					reg = <0x4 0x4>;
+					type = "uint32";
+					default = <10>;
+				};
+			};
+
+			B {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				remaining_attempts@8 {
+					reg = <0x8 0x4>;
+					type = "uint32";
+					default = <3>;
+				};
+				priority@c {
+					reg = <0xc 0x4>;
+					type = "uint32";
+					default = <20>;
+				};
+			};
+
+			last_chosen@10 {
+				reg = <0x10 0x4>;
+				type = "uint32";
+			};
+		};
+
+		machine_id@14 {
+			reg = <0x14 0x24>;
+			type = "string";
+			default = "";
+		};
+	};
+
+	partitions {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "fixed-partitions";
+
+		backend_state: state {
+			partuuid = "33236519-7f32-4dff-8002-3390b62c309d";
+		};
+	};
+
+};
+
diff --git a/buildroot-external/ota/rauc-hook b/buildroot-external/ota/rauc-hook
index 9c2ef3c56..d3133cf7c 100755
--- a/buildroot-external/ota/rauc-hook
+++ b/buildroot-external/ota/rauc-hook
@@ -28,6 +28,25 @@ case "$1" in
     slot-install)
         # Use install handlers below
         ;;
+    slot-post-install)
+        # Handle main slot only
+        test "${RAUC_SLOT_CLASS}" = "kernel" || exit 0
+
+        BOOT_MNT=/mnt/boot
+
+        if ! systemctl -q is-active mnt-boot.mount; then
+            systemctl start mnt-boot.mount
+        fi
+
+        # OS 8+ to 7 and lower downgrade path
+        if ! command -v barebox-state > /dev/null; then
+            cp -f "${BOOT_MNT}/EFI/barebox/state-${RAUC_SLOT_BOOTNAME}.dtb" "${BOOT_MNT}"/EFI/barebox/state.dtb
+            blkdiscard /dev/disk/by-partuuid/33236519-7f32-4dff-8002-3390b62c309d
+            echo "Cleared state and copied default state-${RAUC_SLOT_BOOTNAME}.dtb to state.dtb."
+        fi
+
+        exit 0
+        ;;
     *)
         exit 1
         ;;
diff --git a/buildroot-external/scripts/ota.sh b/buildroot-external/scripts/ota.sh
index 918a5f8ee..87ed5f2a5 100755
--- a/buildroot-external/scripts/ota.sh
+++ b/buildroot-external/scripts/ota.sh
@@ -38,6 +38,9 @@ function create_ota_update() {
         echo "hooks=install"
         echo "[image.kernel]"
         echo "filename=kernel.img"
+        if [ "${BOOTLOADER}" == "barebox" ]; then
+            echo "hooks=post-install"
+        fi
         echo "[image.rootfs]"
         echo "filename=rootfs.img"
     ) > "${rauc_folder}/manifest.raucm"