diff --git a/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb b/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb
index d0d2515..c4f14a2 100644
--- a/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb
+++ b/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "RAUC bundle generator"
 
 inherit bundle
 
-RAUC_BUNDLE_COMPATIBLE = "RaspberryPi4"
+RAUC_BUNDLE_COMPATIBLE = "${MACHINE}"
 RAUC_BUNDLE_VERSION = "v20200703"
 RAUC_BUNDLE_DESCRIPTION = "RAUC Demo Bundle"
 
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 38fa384..77e3115 100644
--- a/meta-rauc-raspberrypi/recipes-core/rauc/rauc_%.bbappend
+++ b/meta-rauc-raspberrypi/recipes-core/rauc/rauc_%.bbappend
@@ -15,6 +15,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/