diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index ec38b98..2c64545 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -1,15 +1,17 @@
-/dev/block/platform/msm_sdcc.1/by-name/system		/system		ext4		ro,errors=panic										wait
-/dev/block/platform/msm_sdcc.1/by-name/userdata		/data		auto		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic		wait,check,encryptable=footer
+/dev/block/platform/msm_sdcc.1/by-name/system		/system		ext4		ro,errors=panic											wait
+/dev/block/platform/msm_sdcc.1/by-name/userdata		/data		ext4		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic			wait,check,encryptable=footer
+/dev/block/platform/msm_sdcc.1/by-name/userdata		/data		f2fs		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic			wait,check,encryptable=footer
 
 # In stock, the following are mounted in init.target.rc. We do it in the fstab.
-/dev/block/platform/msm_sdcc.1/by-name/cache		/cache		auto		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic		wait,check
-/dev/block/platform/msm_sdcc.1/by-name/persist		/persist	ext4		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic		wait,check
-/dev/block/platform/msm_sdcc.1/by-name/efs		/efs		ext4		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic		wait,check
-/dev/block/platform/msm_sdcc.1/by-name/modem		/firmware-modem vfat		ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware:s0	wait
-/dev/block/platform/msm_sdcc.1/by-name/apnhlos		/firmware	vfat		ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware:s0	wait
+/dev/block/platform/msm_sdcc.1/by-name/cache		/cache		ext4		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic			wait,check
+/dev/block/platform/msm_sdcc.1/by-name/cache		/cache		f2fs		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic			wait,check
+/dev/block/platform/msm_sdcc.1/by-name/persist		/persist	ext4		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic			wait,check
+/dev/block/platform/msm_sdcc.1/by-name/efs		/efs		ext4		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic			wait,check
+/dev/block/platform/msm_sdcc.1/by-name/modem		/firmware-modem vfat		ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0	wait
+/dev/block/platform/msm_sdcc.1/by-name/apnhlos		/firmware	vfat		ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0	wait
 
-/devices/msm_sdcc.2/mmc_host/mmc*			auto		auto		defaults										voldmanaged=sdcard1:auto,encryptable=userdata
-/devices/platform/msm_hsusb_host/usb*			auto		auto		defaults										voldmanaged=usb:auto
+/devices/msm_sdcc.2/mmc_host/mmc*			auto		auto		defaults											voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/platform/msm_hsusb_host/usb*			auto		auto		defaults											voldmanaged=usb:auto
 
 # Not done in stock, but newer Android versions might need a bit extra memory.
-/dev/block/zram0					none		swap		defaults										zramsize=75%,swapprio=10,notrim
\ No newline at end of file
+/dev/block/zram0					none		swap		defaults											zramsize=75%,swapprio=10,notrim
\ No newline at end of file