diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7905cd1..5136a73 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -178,13 +178,13 @@ BOARD_SAMSUNG_DYNAMIC_PARTITIONS_PARTITION_LIST := \
 BOARD_SAMSUNG_DYNAMIC_PARTITIONS_SIZE := 14101250048 # (BOARD_SUPER_PARTITION_SIZE - 4MiB)
 
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := erofs
+BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := erofs
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := erofs
+BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := erofs
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := erofs
+BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := erofs
+BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE := erofs
 
 TARGET_COPY_OUT_ODM := odm
 TARGET_COPY_OUT_PRODUCT := product
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 1172e27..483f9d8 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -35,13 +35,13 @@
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 
 #<src>                                                 <mnt_point>            <type>  <mnt_flags and options>                            <fs_mgr_flags>
-system                                                  /system                ext4    ro                                                 avb=vbmeta_system,wait,logical,first_stage_mount,avb_keys=/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey:/avb/t-gsi.avbpubkey:/avb/u-gsi.avbpubkey
-system_ext                                              /system_ext            ext4    ro                                                 avb=vbmeta_system,wait,logical,first_stage_mount,avb_keys=/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey:/avb/t-gsi.avbpubkey:/avb/u-gsi.avbpubkey
-product                                                 /product               ext4    ro                                                 avb,wait,logical,first_stage_mount
-vendor                                                  /vendor                ext4    ro                                                 avb,wait,logical,first_stage_mount
-vendor_dlkm                                             /vendor_dlkm           ext4    ro                                                 avb,wait,logical,first_stage_mount
-system_dlkm                                             /system_dlkm           ext4    ro                                                 avb,wait,logical,first_stage_mount
-odm                                                     /odm                   ext4    ro                                                 avb,wait,logical,first_stage_mount
+system                                                  /system                erofs    ro                                                 avb=vbmeta_system,wait,logical,first_stage_mount,avb_keys=/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey:/avb/t-gsi.avbpubkey:/avb/u-gsi.avbpubkey
+system_ext                                              /system_ext            erofs    ro                                                 avb=vbmeta_system,wait,logical,first_stage_mount,avb_keys=/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey:/avb/t-gsi.avbpubkey:/avb/u-gsi.avbpubkey
+product                                                 /product               erofs    ro                                                 avb,wait,logical,first_stage_mount
+vendor                                                  /vendor                erofs    ro                                                 avb,wait,logical,first_stage_mount
+vendor_dlkm                                             /vendor_dlkm           erofs    ro                                                 avb,wait,logical,first_stage_mount
+system_dlkm                                             /system_dlkm           erofs    ro                                                 avb,wait,logical,first_stage_mount
+odm                                                     /odm                   erofs    ro                                                 avb,wait,logical,first_stage_mount
 /dev/block/by-name/metadata                             /metadata              f2fs      noatime,nosuid,nodev,discard,sync,fsync_mode=strict,data_flush        wait,check,formattable,wrappedkey,first_stage_mount
 /dev/block/bootdevice/by-name/userdata                  /data                  f2fs    noatime,nosuid,nodev,discard,usrquota,grpquota,fsync_mode=nobarrier,reserve_root=32768,resgid=5678,inlinecrypt    latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,metadata_encryption=aes-256-xts:wrappedkey_v0,quota,reservedsize=128M
 /dev/block/bootdevice/by-name/cache                     /cache                 ext4    noatime,nosuid,nodev,noauto_da_alloc,journal_checksum,data=ordered,errors=panic      wait,check