diff --git a/board/filesystem.mk b/board/filesystem.mk
index af55686..d076785 100644
--- a/board/filesystem.mk
+++ b/board/filesystem.mk
@@ -8,3 +8,4 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 26301931008
 BOARD_FLASH_BLOCK_SIZE := 131072
 
 TARGET_USERIMAGES_USE_EXT4 := true
+TARGET_USERIMAGES_USE_F2FS := true
diff --git a/rootdir/fstab.qcom b/rootdir/fstab.qcom
index 4f19a69..b9f8f09 100644
--- a/rootdir/fstab.qcom
+++ b/rootdir/fstab.qcom
@@ -6,7 +6,9 @@
 /dev/block/bootdevice/by-name/boot           /boot        emmc    defaults                                            defaults
 /dev/block/bootdevice/by-name/recovery       /recovery    emmc    defaults                                            defaults
 /dev/block/bootdevice/by-name/system         /system      ext4    ro,barrier=1                                        wait
+/dev/block/bootdevice/by-name/userdata       /data        f2fs    nosuid,nodev,inline_xattr                           wait,formattable,check,forceencrypt=footer
 /dev/block/bootdevice/by-name/userdata       /data        ext4    nosuid,nodev,barrier=1,noauto_da_alloc              wait,formattable,check,forceencrypt=footer
+/dev/block/bootdevice/by-name/cache          /cache       f2fs    nosuid,nodev,inline_xattr                           wait,formattable
 /dev/block/bootdevice/by-name/cache          /cache       ext4    nosuid,nodev,barrier=1                              wait,formattable
 /dev/block/bootdevice/by-name/persist        /persist     ext4    nosuid,nodev,barrier=1                              wait
 /dev/block/bootdevice/by-name/dsp            /dsp         ext4    ro,nosuid,nodev,barrier=1                           wait