diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ae316bb..28db83d 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -105,11 +105,11 @@ BOARD_SUPER_PARTITION_GROUPS := qti_dynamic_partitions
 BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST := odm product system system_ext vendor
 
 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_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_USES_METADATA_PARTITION := true
 
diff --git a/rootdir/etc/fstab.default b/rootdir/etc/fstab.default
index 0547a60..a71c1da 100644
--- a/rootdir/etc/fstab.default
+++ b/rootdir/etc/fstab.default
@@ -34,10 +34,15 @@
 
 #<src>                                                 <mnt_point>               <type>  <mnt_flags and options>                            <fs_mgr_flags>
 system                                                  /system                  ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
+system                                                  /system                  erofs   ro                                                   wait,avb,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
 system_ext                                              /system_ext              ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
+system_ext                                              /system_ext              erofs   ro                                                   wait,avb,logical,first_stage_mount
 product                                                 /product                 ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
+product                                                 /product                 erofs   ro                                                   wait,avb,logical,first_stage_mount
 vendor                                                  /vendor                  ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
+vendor                                                  /vendor                  erofs   ro                                                   wait,avb,logical,first_stage_mount
 odm                                                     /odm                     ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
+odm                                                     /odm                     erofs   ro                                                   wait,avb,logical,first_stage_mount
 /dev/block/bootdevice/by-name/cache                     /cache                   ext4    nosuid,noatime,nodev,barrier=1                       wait
 /dev/block/by-name/metadata                             /metadata                ext4    noatime,nosuid,nodev,discard                         wait,check,formattable,first_stage_mount
 
diff --git a/rootdir/etc/fstab.emmc b/rootdir/etc/fstab.emmc
index 9740b17..740cd22 100644
--- a/rootdir/etc/fstab.emmc
+++ b/rootdir/etc/fstab.emmc
@@ -34,10 +34,15 @@
 
 #<src>                                                 <mnt_point>               <type>  <mnt_flags and options>                            <fs_mgr_flags>
 system                                                  /system                  ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
+system                                                  /system                  erofs   ro                                                   wait,avb,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
 system_ext                                              /system_ext              ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
+system_ext                                              /system_ext              erofs   ro                                                   wait,avb,logical,first_stage_mount
 product                                                 /product                 ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
+product                                                 /product                 erofs   ro                                                   wait,avb,logical,first_stage_mount
 vendor                                                  /vendor                  ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
+vendor                                                  /vendor                  erofs   ro                                                   wait,avb,logical,first_stage_mount
 odm                                                     /odm                     ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
+odm                                                     /odm                     erofs   ro                                                   wait,avb,logical,first_stage_mount
 /dev/block/bootdevice/by-name/cache                     /cache                   ext4    nosuid,noatime,nodev,barrier=1                       wait
 /dev/block/by-name/metadata                             /metadata                ext4    noatime,nosuid,nodev,discard                         wait,formattable,first_stage_mount
 
diff --git a/rootdir/etc/recovery.fstab b/rootdir/etc/recovery.fstab
index c06ca26..184f099 100644
--- a/rootdir/etc/recovery.fstab
+++ b/rootdir/etc/recovery.fstab
@@ -30,9 +30,13 @@
 #device         mount point      fstype        [device2] [length=]
 
 system                                     /system         ext4    ro,barrier=1,discard                                            wait,avb=vbmeta_system,logical,first_stage_mount
+system                                     /system         erofs   ro                                                              wait,avb=vbmeta_system,logical,first_stage_mount
 system_ext                                 /system_ext     ext4    ro,barrier=1,discard                                            wait,avb=vbmeta_system,logical,first_stage_mount
+system_ext                                 /system_ext     erofs   ro                                                              wait,avb=vbmeta_system,logical,first_stage_mount
 vendor                                     /vendor         ext4    ro,barrier=1,discard                                            wait,avb,logical,first_stage_mount
+vendor                                     /vendor         erofs   ro                                                              wait,avb,logical,first_stage_mount
 product                                    /product        ext4    ro,barrier=1,discard                                            wait,avb=vbmeta_system,logical,first_stage_mount
+product                                    /product        erofs   ro                                                              wait,avb=vbmeta_system,logical,first_stage_mount
 /dev/block/bootdevice/by-name/cache        /cache          ext4    noatime,nosuid,nodev,barrier=1,data=ordered                     wait,check
 /dev/block/bootdevice/by-name/metadata     /metadata       ext4    noatime,nosuid,nodev,discard                                    wait,check,formattable,first_stage_mount
 /dev/block/bootdevice/by-name/userdata     /data           f2fs    noatime,nosuid,nodev,discard                                    wait,check,encryptable=footer