diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 82b96de6..d9225250 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -168,12 +168,15 @@ PRODUCT_FS_COMPRESSION := 1
 BOARD_FLASH_BLOCK_SIZE := 4096
 BOARD_MOUNT_SDCARD_RW := true
 
+# system.img
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := erofs
+
 # product.img
-BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := erofs
 TARGET_COPY_OUT_PRODUCT := product
 
 # system_ext.img
-BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := erofs
 TARGET_COPY_OUT_SYSTEM_EXT := system_ext
 
 # persist.img
diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in
index 9edf95bf..f17c23a2 100644
--- a/conf/fstab.gs201.in
+++ b/conf/fstab.gs201.in
@@ -4,11 +4,11 @@
 # 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,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
-system_ext                                               /system_ext                 ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
-product                                                  /product                    ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
-vendor                                                   /vendor                     ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount
-vendor_dlkm                                              /vendor_dlkm                ext4    ro,barrier=1             wait,slotselect,avb=vbmeta,logical,first_stage_mount
+system                                                   /system                     erofs   ro                       wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
+system_ext                                               /system_ext                 erofs   ro                       wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
+product                                                  /product                    erofs   ro                       wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
+vendor                                                   /vendor                     erofs   ro                       wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount
+vendor_dlkm                                              /vendor_dlkm                erofs   ro                       wait,slotselect,avb=vbmeta,logical,first_stage_mount
 /dev/block/platform/14700000.ufs/by-name/boot            /boot                       emmc    defaults                 slotselect,avb=boot,first_stage_mount
 /dev/block/platform/14700000.ufs/by-name/efs             /mnt/vendor/efs             f2fs    noatime,sync             wait,check,formattable
 /dev/block/platform/14700000.ufs/by-name/efs_backup      /mnt/vendor/efs_backup      f2fs    noatime,sync             wait,check,formattable
diff --git a/conf/fstab.postinstall b/conf/fstab.postinstall
index 955fba71..16b167c2 100644
--- a/conf/fstab.postinstall
+++ b/conf/fstab.postinstall
@@ -1,4 +1,4 @@
 # Android fstab file.
 #
 #<src>    <mnt_point>     <type>  <mnt_flags and options>   <fs_mgr_flags>
-system    /postinstall    ext4    ro,nosuid,nodev,noexec    slotselect_other,logical,avb_keys=/product/etc/security/avb/system_other.avbpubkey
+system    /postinstall    erofs   ro,nosuid,nodev,noexec    slotselect_other,logical,avb_keys=/product/etc/security/avb/system_other.avbpubkey
diff --git a/device.mk b/device.mk
index 5f4dd318..b79976ad 100644
--- a/device.mk
+++ b/device.mk
@@ -23,7 +23,7 @@ endif
 AB_OTA_POSTINSTALL_CONFIG += \
 	RUN_POSTINSTALL_system=true \
 	POSTINSTALL_PATH_system=system/bin/otapreopt_script \
-	FILESYSTEM_TYPE_system=ext4 \
+	FILESYSTEM_TYPE_system=erofs \
 POSTINSTALL_OPTIONAL_system=true
 
 # Set Vendor SPL to match platform