diff --git a/apertis-image-mx6qsabrelite.yaml b/apertis-image-mx6qsabrelite.yaml
index b6b64c834f6bcdabd093ce58b6257fd02dc6cd40..7034aabaf11dfba8db522be1f3267a6588f33e3e 100644
--- a/apertis-image-mx6qsabrelite.yaml
+++ b/apertis-image-mx6qsabrelite.yaml
@@ -100,6 +100,12 @@ actions:
     source: /usr/lib/u-boot/mx6qsabrelite/u-boot.imx
     offset: {{ sector 2 }}
 
+  - action: raw
+    description: Install U-Boot environment
+    origin: filesystem
+    source: /usr/share/u-boot-env-imx6/u-boot.env
+    offset: 0xC0000
+
   - action: run
     description: "Save installed package status"
     chroot: false
diff --git a/apertis-ospack-minimal.yaml b/apertis-ospack-minimal.yaml
index fac28a3a2ab8b09a6c5fff6da7d7659ee2735fc3..803e3290ab4ab6988bccf2bf0cedcc0075462d04 100644
--- a/apertis-ospack-minimal.yaml
+++ b/apertis-ospack-minimal.yaml
@@ -93,6 +93,9 @@ actions:
 {{ if eq $architecture "armhf" }}
   - action: overlay
     source: overlays/initramfs-modules-imx6
+
+  - action: overlay
+    source: overlays/u-boot-env-imx6
 {{ end }}
 
   - action: overlay
diff --git a/apertis-ostree-rollback-commit.yaml b/apertis-ostree-rollback-commit.yaml
index b3d41fa22c914e6fd14f2a7655d2bdbaa73ab44f..20afcb7325b3cacf63a325304babfd3c2b1abb07 100644
--- a/apertis-ostree-rollback-commit.yaml
+++ b/apertis-ostree-rollback-commit.yaml
@@ -6,7 +6,7 @@
 {{ $board := or .board "uefi" }}
 {{ $repourl := or .repourl "https://images.apertis.org/ostree/repo" }}
 {{ $osname := or .osname "apertis" }}
-{{ $branch := or .branch (printf "%s/%s/%s-%s/%s-rollback" $osname $suite $architecture $board $type) }}
+{{ $branch := or .branch (printf "%s/%s/%s-%s/%s" $osname $suite $architecture $board $type) }}
 {{ $ostree := or .ostree "repo" }}
 {{ $message := or .message "Update" }}
 
@@ -15,6 +15,40 @@
 architecture: {{ $architecture }}
 
 actions:
+  - action: image-partition
+    imagename: {{ $image }}.img
+{{ if eq $type "minimal" }}
+    imagesize: 4G
+{{end}}
+{{ if eq $type "target" "development" }}
+    imagesize: 15G
+{{end}}
+    partitiontype: gpt
+    gpt_gap: {{ sector 6144 }}b
+
+    mountpoints:
+      - mountpoint: /
+        partition: system
+      - mountpoint: /boot
+        partition: boot
+      - mountpoint: /home
+        partition: general_storage
+
+    partitions:
+      - name: boot
+        fs: ext2
+        start: 6176s
+        end: 1024M
+        flags: [ boot ]
+      - name: system
+        fs: ext4
+        start: 1024M
+        end: 3000M
+      - name: general_storage
+        fs: btrfs
+        start: 3000M
+        end: 100%
+
   - action: ostree-deploy
     description: Deploying ostree onto image
     repository: {{ $ostree }}
@@ -29,6 +63,6 @@ actions:
 
   - action: ostree-commit
     repository: {{ $ostree }}
-    branch: {{ $branch }}
+    branch: {{ $branch }}-rollback
     subject: {{ $message }} rollback test commit
 
diff --git a/overlays/u-boot-env-imx6/usr/share/u-boot-env-imx6/u-boot-env.txt b/overlays/u-boot-env-imx6/usr/share/u-boot-env-imx6/u-boot-env.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dd2e9006b47b66dc8e2d19ad06a8f7a94e09e074
--- /dev/null
+++ b/overlays/u-boot-env-imx6/usr/share/u-boot-env-imx6/u-boot-env.txt
@@ -0,0 +1 @@
+bootcount=0
diff --git a/overlays/u-boot-env-imx6/usr/share/u-boot-env-imx6/u-boot.env b/overlays/u-boot-env-imx6/usr/share/u-boot-env-imx6/u-boot.env
new file mode 100644
index 0000000000000000000000000000000000000000..005b4768b595a3bb7f8cfd68db9fcd13183efa31
Binary files /dev/null and b/overlays/u-boot-env-imx6/usr/share/u-boot-env-imx6/u-boot.env differ