diff --git a/board/czechlight/clearfog/mk-rauc-bundle.sh b/board/czechlight/clearfog/mk-rauc-bundle.sh
deleted file mode 100755
index 12241fb..0000000
--- a/board/czechlight/clearfog/mk-rauc-bundle.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-RAUC_BUILD_DIR=${BUILD_DIR}/rauc-work-tmp
-RAUC_IMAGE=${BINARIES_DIR}/update.raucb
-ROOTFS_NAME=rootfs.tar.xz
-EMPTY_TAR_NAME=cfg.tar.xz
-RAUC_HOOK=${RAUC_BUILD_DIR}/hook.sh
-
-rm -rf ${RAUC_BUILD_DIR}
-mkdir ${RAUC_BUILD_DIR}
-rm -f ${RAUC_IMAGE}
-
-ln ${BINARIES_DIR}/${ROOTFS_NAME} ${RAUC_BUILD_DIR}/
-tar -cJf ${RAUC_BUILD_DIR}/${EMPTY_TAR_NAME} -T /dev/null
-cp ${BR2_EXTERNAL_CZECHLIGHT_PATH}/board/czechlight/common/rauc-hook.sh ${RAUC_HOOK}
-cat > ${RAUC_BUILD_DIR}/manifest.raucm << EOF
-[update]
-compatible=czechlight-clearfog
-version=dev
-
-[hooks]
-filename=hook.sh
-
-[image.rootfs]
-filename=${ROOTFS_NAME}
-
-[image.cfg]
-filename=${EMPTY_TAR_NAME}
-hooks=post-install
-EOF
-
-rauc \
-  --cert ${BR2_EXTERNAL_CZECHLIGHT_PATH}/crypto/rauc-cert.pem \
-  --key ${BR2_EXTERNAL_CZECHLIGHT_PATH}/crypto/rauc-key.pem \
-  bundle ${RAUC_BUILD_DIR} ${RAUC_IMAGE}
diff --git a/board/czechlight/common/rauc-manifest.raucm.in b/board/czechlight/common/rauc-manifest.raucm.in
new file mode 100644
index 0000000..6a5a265
--- /dev/null
+++ b/board/czechlight/common/rauc-manifest.raucm.in
@@ -0,0 +1,13 @@
+[update]
+compatible=CZECHLIGHT_RAUC_COMPATIBLE
+version=CZECHLIGHT_RAUC_IMAGE_VERSION
+
+[hooks]
+filename=hook.sh
+
+[image.rootfs]
+filename=rootfs.tar.xz
+
+[image.cfg]
+filename=cfg.tar.xz
+hooks=post-install
diff --git a/configs/czechlight_clearfog_defconfig b/configs/czechlight_clearfog_defconfig
index bbe9ae7..dcd39c3 100644
--- a/configs/czechlight_clearfog_defconfig
+++ b/configs/czechlight_clearfog_defconfig
@@ -13,7 +13,7 @@
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/overlay/ $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/overlay/"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/install-rauc-cert.sh $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/copy-boot-scr.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/mk-rauc-bundle.sh ${BR2_EXTERNAL_CZECHLIGHT_PATH}/board/czechlight/clearfog/usb-flash-genimage.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh ${BR2_EXTERNAL_CZECHLIGHT_PATH}/board/czechlight/clearfog/usb-flash-genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
@@ -67,7 +67,7 @@
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
-BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_CZECHLIGHT_CFG_FS=y
 CZECHLIGHT_CFG_FS_SIZE="256M"
+CZECHLIGHT_RAUC_ROOTFS=y
+CZECHLIGHT_RAUC_COMPATIBLE="czechlight-clearfog"
 CZECHLIGHT_NETCONF=y
diff --git a/package/Config.in b/package/Config.in
index 64d8537..17cd498 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1,4 +1,5 @@
 source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/cla-sysrepo/Config.in"
 source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/czechlight-cfg-fs/Config.in"
+source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/czechlight-rauc/Config.in"
 source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/czechlight-separate-boot/Config.in"
 source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/grub2-tools/Config.in"
diff --git a/package/czechlight-rauc/Config.in b/package/czechlight-rauc/Config.in
new file mode 100644
index 0000000..a04f412
--- /dev/null
+++ b/package/czechlight-rauc/Config.in
@@ -0,0 +1,13 @@
+config CZECHLIGHT_RAUC_ROOTFS
+	bool "Create RAUC update bundle"
+	select BR2_PACKAGE_CZECHLIGHT_CFG_FS
+	select BR2_PACKAGE_HOST_RAUC
+
+if CZECHLIGHT_RAUC_ROOTFS
+
+config CZECHLIGHT_RAUC_COMPATIBLE
+	string "HW compatibility string"
+	help
+	  Unique identifier which specifies what boards accept a given SW image.
+
+endif # CZECHLIGHT_RAUC_ROOTFS
diff --git a/package/czechlight-rauc/czechlight-rauc.mk b/package/czechlight-rauc/czechlight-rauc.mk
new file mode 100644
index 0000000..436b647
--- /dev/null
+++ b/package/czechlight-rauc/czechlight-rauc.mk
@@ -0,0 +1,37 @@
+CZECHLIGHT_RAUC_TMP_TARGET_DIR = $(FS_DIR)/rootfs.czechlight-rauc.tmp
+
+CZECHLIGHT_RAUC_IMAGE_VERSION = dev
+
+$(BINARIES_DIR)/update.raucb: host-rauc rootfs-tar
+	@$(call MESSAGE,"Generating RAUC update bundle")
+	$(RM) -rf $(CZECHLIGHT_RAUC_TMP_TARGET_DIR)
+	mkdir -p $(CZECHLIGHT_RAUC_TMP_TARGET_DIR)
+	sed \
+		-e 's|CZECHLIGHT_RAUC_IMAGE_VERSION|$(call qstrip,$(CZECHLIGHT_RAUC_IMAGE_VERSION))|' \
+		-e 's|CZECHLIGHT_RAUC_COMPATIBLE|$(call qstrip,$(CZECHLIGHT_RAUC_COMPATIBLE))|' \
+		$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/rauc-manifest.raucm.in \
+		> $(CZECHLIGHT_RAUC_TMP_TARGET_DIR)/manifest.raucm
+
+	$(RM) -f $(BINARIES_DIR)/update.raucb
+	ln $(BINARIES_DIR)/rootfs.tar.xz $(CZECHLIGHT_RAUC_TMP_TARGET_DIR)
+	tar -cJf $(CZECHLIGHT_RAUC_TMP_TARGET_DIR)/cfg.tar.xz -T /dev/null
+	cp $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/rauc-hook.sh $(CZECHLIGHT_RAUC_TMP_TARGET_DIR)/hook.sh
+
+	$(HOST_DIR)/usr/bin/rauc \
+		--cert $(BR2_EXTERNAL_CZECHLIGHT_PATH)/crypto/rauc-cert.pem \
+		--key $(BR2_EXTERNAL_CZECHLIGHT_PATH)/crypto/rauc-key.pem \
+		bundle $(CZECHLIGHT_RAUC_TMP_TARGET_DIR) $(BINARIES_DIR)/update.raucb
+
+rootfs-czechlight-rauc: $(BINARIES_DIR)/update.raucb
+
+rootfs-czechlight-rauc-show-depends:
+	@echo host-rauc rootfs-tar
+
+.PHONY: rootfs-czechlight-rauc rootfs-czechlight-rauc-show-depends
+
+ifeq ($(CZECHLIGHT_RAUC_ROOTFS),y)
+TARGETS_ROOTFS += rootfs-czechlight-rauc
+ifeq ($(call qstrip,$(CZECHLIGHT_RAUC_COMPATIBLE)),)
+$(error CZECHLIGHT_RAUC_COMPATIBLE cannot be empty)
+endif
+endif