diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9716c68bc..87f4d944a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -316,7 +316,7 @@ jobs:
           echo "## Partitions" >> $GITHUB_STEP_SUMMARY
           echo "| File | Size (bytes) | Size (formatted) |" >> $GITHUB_STEP_SUMMARY
           echo "|:-|:-|:-|" >> $GITHUB_STEP_SUMMARY
-          for f in boot.vfat kernel.img rootfs.squashfs overlay.ext4 data.ext4; do
+          for f in boot.vfat kernel.img rootfs.erofs overlay.ext4 data.ext4; do
             echo "| ${f} | $(du -b output/images/$f | cut -f1) | $(du -bh output/images/$f | cut -f1) |" >> $GITHUB_STEP_SUMMARY
           done
 
diff --git a/buildroot-external/board/asus/tinker/uboot-boot.ush b/buildroot-external/board/asus/tinker/uboot-boot.ush
index f38cf4eac..2b098cb89 100644
--- a/buildroot-external/board/asus/tinker/uboot-boot.ush
+++ b/buildroot-external/board/asus/tinker/uboot-boot.ush
@@ -23,8 +23,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro rootwait"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro rootwait"
 
 # Load environment from haos-config.txt
 if test -e mmc ${devnum}:1 haos-config.txt; then
diff --git a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush
index 39f386a9b..9ad3ea48a 100644
--- a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush
@@ -25,8 +25,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
+setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
 
 # Load environment from haos-config.txt
 if test -e mmc ${devnum}:1 haos-config.txt; then
diff --git a/buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush
index 36d6cce8e..64528a9d4 100644
--- a/buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush
@@ -25,8 +25,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} clk_ignore_unused usb-storage.quirks=0x2537:0x1066:u,0x2537:0x1068:u ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
+setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
 
 # Load environment from haos-config.txt
 if test -e mmc ${devnum}:1 haos-config.txt; then
diff --git a/buildroot-external/board/hardkernel/odroid-m1/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-m1/uboot-boot.ush
index 8bcdcdb4e..4578b024a 100644
--- a/buildroot-external/board/hardkernel/odroid-m1/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-m1/uboot-boot.ush
@@ -23,8 +23,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro rootwait"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro rootwait"
 
 part number mmc ${devnum} hassos-boot boot_partnum
 
diff --git a/buildroot-external/board/hardkernel/odroid-m1s/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-m1s/uboot-boot.ush
index 719c6c0e5..1ebbcaeb9 100644
--- a/buildroot-external/board/hardkernel/odroid-m1s/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-m1s/uboot-boot.ush
@@ -23,8 +23,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro rootwait"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro rootwait"
 
 part number ${devtype} ${devnum} hassos-boot boot_partnum
 
diff --git a/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush
index 2ce31fa32..1128f3825 100644
--- a/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush
@@ -25,8 +25,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
+setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
 
 # Load environment from haos-config.txt
 if test -e mmc ${devnum}:1 haos-config.txt; then
diff --git a/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush
index d05c0a17d..fbc822606 100644
--- a/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush
@@ -27,8 +27,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
+setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
 
 # Load extraargs
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
diff --git a/buildroot-external/board/khadas/vim3/uboot-boot.ush b/buildroot-external/board/khadas/vim3/uboot-boot.ush
index 04322583d..d132a5b20 100644
--- a/buildroot-external/board/khadas/vim3/uboot-boot.ush
+++ b/buildroot-external/board/khadas/vim3/uboot-boot.ush
@@ -25,8 +25,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
+setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
 
 # Load environment from haos-config.txt
 if test -e mmc ${devnum}:1 haos-config.txt; then
diff --git a/buildroot-external/board/nabucasa/green/uboot-boot.ush b/buildroot-external/board/nabucasa/green/uboot-boot.ush
index 7775cfa4e..fce59905d 100755
--- a/buildroot-external/board/nabucasa/green/uboot-boot.ush
+++ b/buildroot-external/board/nabucasa/green/uboot-boot.ush
@@ -28,8 +28,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 rootwait systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro"
 
 part number ${devtype} ${devnum} hassos-boot boot_partnum
 
diff --git a/buildroot-external/board/raspberrypi/rpi5-64/cmdline.txt b/buildroot-external/board/raspberrypi/rpi5-64/cmdline.txt
index 112bcaf92..9466f253c 100644
--- a/buildroot-external/board/raspberrypi/rpi5-64/cmdline.txt
+++ b/buildroot-external/board/raspberrypi/rpi5-64/cmdline.txt
@@ -1 +1 @@
-zram.enabled=1 zram.num_devices=3 rootwait cgroup_enable=memory fsck.repair=yes console=tty0 root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rauc.slot=A
+zram.enabled=1 zram.num_devices=3 rootwait cgroup_enable=memory fsck.repair=yes console=tty0 root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro rauc.slot=A
diff --git a/buildroot-external/board/raspberrypi/uboot-boot.ush b/buildroot-external/board/raspberrypi/uboot-boot.ush
index c5b581ba5..6b46edcb1 100644
--- a/buildroot-external/board/raspberrypi/uboot-boot.ush
+++ b/buildroot-external/board/raspberrypi/uboot-boot.ush
@@ -24,8 +24,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 rootwait systemd.machine_id=${MACHINE_ID} cgroup_enable=memory fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro"
 
 # Preserve origin bootargs
 setenv bootargs_rpi
diff --git a/buildroot-external/board/raspberrypi/uboot-boot64.ush b/buildroot-external/board/raspberrypi/uboot-boot64.ush
index 9cc7c392e..8c4c4a27c 100644
--- a/buildroot-external/board/raspberrypi/uboot-boot64.ush
+++ b/buildroot-external/board/raspberrypi/uboot-boot64.ush
@@ -24,8 +24,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 rootwait systemd.machine_id=${MACHINE_ID} cgroup_enable=memory fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro"
 
 # Preserve origin bootargs
 setenv bootargs_rpi
diff --git a/buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush b/buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush
index 308f37077..ef6f06cd9 100644
--- a/buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush
+++ b/buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush
@@ -42,8 +42,8 @@ elif gpio input GPIO26; then
 fi
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro"
 
 # Preserve origin bootargs
 setenv bootargs_rpi
diff --git a/buildroot-external/configs/generic_aarch64_defconfig b/buildroot-external/configs/generic_aarch64_defconfig
index c9017c517..9d069d07f 100644
--- a/buildroot-external/configs/generic_aarch64_defconfig
+++ b/buildroot-external/configs/generic_aarch64_defconfig
@@ -152,8 +152,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_GRUB2=y
 BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop regexp loadenv echo cat test configfile"
diff --git a/buildroot-external/configs/generic_x86_64_defconfig b/buildroot-external/configs/generic_x86_64_defconfig
index 3a94e27fc..ef6df44c5 100644
--- a/buildroot-external/configs/generic_x86_64_defconfig
+++ b/buildroot-external/configs/generic_x86_64_defconfig
@@ -154,8 +154,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_GRUB2=y
 BR2_TARGET_GRUB2_I386_EFI=y
diff --git a/buildroot-external/configs/green_defconfig b/buildroot-external/configs/green_defconfig
index 398e5b7e2..bf56fdd3d 100755
--- a/buildroot-external/configs/green_defconfig
+++ b/buildroot-external/configs/green_defconfig
@@ -131,8 +131,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/khadas_vim3_defconfig b/buildroot-external/configs/khadas_vim3_defconfig
index 9119cd766..3343c09e2 100644
--- a/buildroot-external/configs/khadas_vim3_defconfig
+++ b/buildroot-external/configs/khadas_vim3_defconfig
@@ -126,8 +126,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig
index e735de2ec..e6db76d77 100644
--- a/buildroot-external/configs/odroid_c2_defconfig
+++ b/buildroot-external/configs/odroid_c2_defconfig
@@ -126,8 +126,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/odroid_c4_defconfig b/buildroot-external/configs/odroid_c4_defconfig
index 56d00a7be..cbe48ad9b 100644
--- a/buildroot-external/configs/odroid_c4_defconfig
+++ b/buildroot-external/configs/odroid_c4_defconfig
@@ -124,8 +124,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/odroid_m1_defconfig b/buildroot-external/configs/odroid_m1_defconfig
index 61683cb2b..a2ff20ec4 100644
--- a/buildroot-external/configs/odroid_m1_defconfig
+++ b/buildroot-external/configs/odroid_m1_defconfig
@@ -126,8 +126,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/odroid_m1s_defconfig b/buildroot-external/configs/odroid_m1s_defconfig
index e9ba09c9d..973463221 100644
--- a/buildroot-external/configs/odroid_m1s_defconfig
+++ b/buildroot-external/configs/odroid_m1s_defconfig
@@ -126,8 +126,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig
index c98089c5b..dcf8c2685 100644
--- a/buildroot-external/configs/odroid_n2_defconfig
+++ b/buildroot-external/configs/odroid_n2_defconfig
@@ -126,8 +126,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig
index 88284a2a4..0f6730c6b 100644
--- a/buildroot-external/configs/odroid_xu4_defconfig
+++ b/buildroot-external/configs/odroid_xu4_defconfig
@@ -126,8 +126,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig
index 29ed31d80..215a6effc 100644
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@@ -156,8 +156,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_GRUB2=y
 BR2_TARGET_GRUB2_X86_64_EFI=y
diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig
index f6bb7adc3..13d1f87ce 100644
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@@ -129,8 +129,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig
index 20003a1a5..1b01e1951 100644
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@@ -130,8 +130,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig
index a3794f063..7074e8c66 100644
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@@ -131,8 +131,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig
index 7bf9ad2df..52130dbca 100644
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_defconfig
@@ -131,8 +131,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig
index a20d03d1a..9d3fcb345 100644
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/buildroot-external/configs/rpi4_defconfig
@@ -130,8 +130,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/rpi5_64_defconfig b/buildroot-external/configs/rpi5_64_defconfig
index a312282f7..40072f852 100644
--- a/buildroot-external/configs/rpi5_64_defconfig
+++ b/buildroot-external/configs/rpi5_64_defconfig
@@ -129,8 +129,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig
index 1bc1ee444..12d9f67d0 100644
--- a/buildroot-external/configs/tinker_defconfig
+++ b/buildroot-external/configs/tinker_defconfig
@@ -126,8 +126,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/configs/yellow_defconfig b/buildroot-external/configs/yellow_defconfig
index c553cf8e2..7d2776916 100644
--- a/buildroot-external/configs/yellow_defconfig
+++ b/buildroot-external/configs/yellow_defconfig
@@ -133,8 +133,12 @@ BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EROFS=y
+BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL=12
+BR2_TARGET_ROOTFS_EROFS_DEDUPE=y
+BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y
+BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y
+BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot-external/genimage/image-raucb-nospl.cfg b/buildroot-external/genimage/image-raucb-nospl.cfg
index 57697fb83..59b4e3d28 100644
--- a/buildroot-external/genimage/image-raucb-nospl.cfg
+++ b/buildroot-external/genimage/image-raucb-nospl.cfg
@@ -6,5 +6,5 @@ rauc {
 	file hook { image = "${BR2_EXTERNAL_HASSOS_PATH}/ota/rauc-hook" }
 	file boot.vfat { image = "boot.vfat" }
 	file kernel.img { image = "kernel.img" }
-	file rootfs.img { image = "rootfs.squashfs" }
+	file rootfs.img { image = ${SYSTEM_IMAGE} }
 }
diff --git a/buildroot-external/genimage/image-raucb-spl.cfg b/buildroot-external/genimage/image-raucb-spl.cfg
index 474497b7d..ab2d9a265 100644
--- a/buildroot-external/genimage/image-raucb-spl.cfg
+++ b/buildroot-external/genimage/image-raucb-spl.cfg
@@ -7,5 +7,5 @@ rauc {
 	file spl.img { image = "spl.img" }
 	file boot.vfat { image = "boot.vfat" }
 	file kernel.img { image = "kernel.img" }
-	file rootfs.img { image = "rootfs.squashfs" }
+	file rootfs.img { image = ${SYSTEM_IMAGE} }
 }
diff --git a/buildroot-external/genimage/partitions-os-gpt.cfg b/buildroot-external/genimage/partitions-os-gpt.cfg
index e3ba0cef2..83028a8d7 100644
--- a/buildroot-external/genimage/partitions-os-gpt.cfg
+++ b/buildroot-external/genimage/partitions-os-gpt.cfg
@@ -11,7 +11,7 @@ partition hassos-system0 {
 	partition-type-uuid = "linux"
 	partition-uuid = "8d3d53e3-6d49-4c38-8349-aff6859e82fd"
 	size = ${SYSTEM_SIZE}
-	image = "rootfs.squashfs"
+	image = ${SYSTEM_IMAGE}
 }
 
 partition hassos-kernel1 {
@@ -43,5 +43,5 @@ partition hassos-data {
 	partition-type-uuid = "linux"
 	partition-uuid = "a52a4597-fa3a-4851-aefd-2fbe9f849079"
 	size = ${DATA_SIZE}
-	image = "data.ext4"
+	image = ${DATA_IMAGE}
 }
diff --git a/buildroot-external/genimage/partitions-os-mbr.cfg b/buildroot-external/genimage/partitions-os-mbr.cfg
index f0afe1333..ba9cc06c5 100644
--- a/buildroot-external/genimage/partitions-os-mbr.cfg
+++ b/buildroot-external/genimage/partitions-os-mbr.cfg
@@ -14,7 +14,7 @@ partition hassos-kernel0 {
 partition hassos-system0 {
 	partition-type = 0x83
 	size = ${SYSTEM_SIZE}
-	image = "rootfs.squashfs"
+	image = ${SYSTEM_IMAGE}
 }
 
 partition hassos-kernel1 {
@@ -42,6 +42,6 @@ partition hassos-overlay {
 partition hassos-data {
 	partition-type = 0x83
 	size = ${DATA_SIZE}
-	image = "data.ext4"
+	image = ${DATA_IMAGE}
 	forced-primary = "yes"
 }
diff --git a/buildroot-external/kernel/v6.6.y/hassos.config b/buildroot-external/kernel/v6.6.y/hassos.config
index 76bae809a..c8aef00ca 100644
--- a/buildroot-external/kernel/v6.6.y/hassos.config
+++ b/buildroot-external/kernel/v6.6.y/hassos.config
@@ -35,6 +35,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_BLOCK=y
+CONFIG_EROFS_FS=y
 CONFIG_EXT4_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
diff --git a/buildroot-external/scripts/hdd-image.sh b/buildroot-external/scripts/hdd-image.sh
index dcf625067..704365831 100755
--- a/buildroot-external/scripts/hdd-image.sh
+++ b/buildroot-external/scripts/hdd-image.sh
@@ -29,6 +29,9 @@ function create_disk_image() {
     IMAGE_NAME="$(hassos_image_basename)"
     BOOT_SPL_TYPE=$(test "$BOOT_SPL" == "true" && echo "spl" || echo "nospl")
     export RAUC_MANIFEST IMAGE_NAME BOOT_SPL_TYPE
+    SYSTEM_IMAGE=$(path_rootfs_img)
+    DATA_IMAGE=$(path_data_img)
+    export SYSTEM_IMAGE DATA_IMAGE
 
     trap 'rm -rf "${ROOTPATH_TMP}" "${GENIMAGE_TMPPATH}"' EXIT
     ROOTPATH_TMP="$(mktemp -d)"
diff --git a/buildroot-external/scripts/name.sh b/buildroot-external/scripts/name.sh
index b6a622d65..afeb4280a 100755
--- a/buildroot-external/scripts/name.sh
+++ b/buildroot-external/scripts/name.sh
@@ -20,14 +20,6 @@ function hassos_version() {
     fi
 }
 
-function path_kernel_img() {
-    echo "${BINARIES_DIR}/kernel.img"
-}
-
-function path_boot_img() {
-    echo "${BINARIES_DIR}/boot.vfat"
-}
-
 function path_boot_dir() {
     echo "${BINARIES_DIR}/boot"
 }
@@ -36,11 +28,6 @@ function path_data_img() {
     echo "${BINARIES_DIR}/data.ext4"
 }
 
-function path_overlay_img() {
-    echo "${BINARIES_DIR}/overlay.ext4"
-}
-
 function path_rootfs_img() {
-    echo "${BINARIES_DIR}/rootfs.squashfs"
+    echo "${BINARIES_DIR}/rootfs.erofs"
 }
-