diff --git a/meta-rauc-raspberrypi/README.rst b/meta-rauc-raspberrypi/README.rst
index 45528d7..3590c79 100644
--- a/meta-rauc-raspberrypi/README.rst
+++ b/meta-rauc-raspberrypi/README.rst
@@ -96,7 +96,7 @@ IV. Build and Install The Demo Bundle
 
 To build the bundle, run::
 
-  $ bitbake qemu-demo-bundle
+  $ bitbake update-bundle
 
 Copy the generated bundle to the target system via nc, scp or an attached USB stick.
 
diff --git a/meta-rauc-raspberrypi/conf/layer.conf b/meta-rauc-raspberrypi/conf/layer.conf
index e9e823a..142caf4 100644
--- a/meta-rauc-raspberrypi/conf/layer.conf
+++ b/meta-rauc-raspberrypi/conf/layer.conf
@@ -10,4 +10,4 @@ BBFILE_PATTERN_meta-rauc-raspberrypi = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-rauc-raspberrypi = "6"
 
 LAYERDEPENDS_meta-rauc-raspberrypi = "core rauc raspberrypi"
-LAYERSERIES_COMPAT_meta-rauc-raspberrypi = "dunfell gatesgarth hardknott honister kirkstone"
+LAYERSERIES_COMPAT_meta-rauc-raspberrypi = "kirkstone"
diff --git a/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb b/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb
index 498b948..c4f14a2 100644
--- a/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb
+++ b/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb
@@ -2,9 +2,12 @@ DESCRIPTION = "RAUC bundle generator"
 
 inherit bundle
 
-RAUC_BUNDLE_COMPATIBLE = "RaspberryPi4"
+RAUC_BUNDLE_COMPATIBLE = "${MACHINE}"
 RAUC_BUNDLE_VERSION = "v20200703"
 RAUC_BUNDLE_DESCRIPTION = "RAUC Demo Bundle"
+
+RAUC_BUNDLE_FORMAT = "verity"
+
 RAUC_BUNDLE_SLOTS = "rootfs" 
 RAUC_SLOT_rootfs = "core-image-minimal"
 RAUC_SLOT_rootfs[fstype] = "ext4"
diff --git a/meta-rauc-raspberrypi/recipes-core/rauc/files/rauc-grow-data-partition.service b/meta-rauc-raspberrypi/recipes-core/rauc/files/rauc-grow-data-partition.service
index bcba29b..55be868 100644
--- a/meta-rauc-raspberrypi/recipes-core/rauc/files/rauc-grow-data-partition.service
+++ b/meta-rauc-raspberrypi/recipes-core/rauc/files/rauc-grow-data-partition.service
@@ -7,6 +7,7 @@ Before=home.mount
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/sbin/parted --script /dev/mmcblk0 resizepart 4 100%
+ExecStart=/usr/sbin/parted --script /dev/mmcblk0 resizepart 6 100%
 
 [Install]
 WantedBy=home.mount
diff --git a/meta-rauc-raspberrypi/recipes-core/rauc/files/system.conf b/meta-rauc-raspberrypi/recipes-core/rauc/files/system.conf
index 36dac55..bd8568b 100644
--- a/meta-rauc-raspberrypi/recipes-core/rauc/files/system.conf
+++ b/meta-rauc-raspberrypi/recipes-core/rauc/files/system.conf
@@ -1,5 +1,5 @@
 [system]
-compatible=RaspberryPi4
+compatible=@@MACHINE@@
 bootloader=uboot
 data-directory=/data/
 
diff --git a/meta-rauc-raspberrypi/recipes-core/rauc/rauc_%.bbappend b/meta-rauc-raspberrypi/recipes-core/rauc/rauc_%.bbappend
index 61514c2..0193527 100644
--- a/meta-rauc-raspberrypi/recipes-core/rauc/rauc_%.bbappend
+++ b/meta-rauc-raspberrypi/recipes-core/rauc/rauc_%.bbappend
@@ -17,6 +17,10 @@ PACKAGES += "rauc-grow-data-part"
 
 RDEPENDS:${PN}-grow-data-part += "parted"
 
+do_install:prepend() {
+    sed -i "s|@@MACHINE@@|${MACHINE}|g" ${WORKDIR}/system.conf
+}
+
 do_install:append() {
 	install -d ${D}${systemd_unitdir}/system/
 	install -m 0644 ${WORKDIR}/rauc-grow-data-partition.service ${D}${systemd_unitdir}/system/
diff --git a/meta-rauc-raspberrypi/recipes-kernel/linux/files/rauc.cfg b/meta-rauc-raspberrypi/recipes-kernel/linux/files/rauc.cfg
index e4723bc..16b46c2 100644
--- a/meta-rauc-raspberrypi/recipes-kernel/linux/files/rauc.cfg
+++ b/meta-rauc-raspberrypi/recipes-kernel/linux/files/rauc.cfg
@@ -1,6 +1,8 @@
-CONFIG_SQUASHFS=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_LOOP=y
-CONFIG_SQUASHFS_FILE_CACHE=y
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_DM_VERITY=y
+CONFIG_SQUASHFS=y
+CONFIG_CRYPTO_SHA256=y
+# For bundle streaming
+CONFIG_BLK_DEV_NBD=y