diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 3c4a1432..4b158674 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -11,8 +11,8 @@
 
 # Non-A/B fstab.qcom variant
 #<src>                                   <mnt_point>        <type> <mnt_flags and options>                          <fs_mgr_flags>
-/dev/block/bootdevice/by-name/userdata   /data              ext4   nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime   wait,check,encryptable=footer,crashcheck,quota,reservedsize=128M
-/dev/block/bootdevice/by-name/userdata   /data              f2fs   noatime,nosuid,nodev,nodiratime,fsync_mode=nobarrier,background_gc=off   wait,check,encryptable=footer,crashcheck,quota,reservedsize=128M
+/dev/block/bootdevice/by-name/userdata   /data              ext4   nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime   wait,check,encryptable=footer,quota,reservedsize=128M
+/dev/block/bootdevice/by-name/userdata   /data              f2fs   noatime,nosuid,nodev,nodiratime,fsync_mode=nobarrier,background_gc=off   wait,check,encryptable=footer,quota,reservedsize=128M
 /devices/soc/c084000.sdhci/mmc_host*     /storage/sdcard1   vfat   nosuid,nodev                                     wait,voldmanaged=sdcard1:auto,encryptable=footer
 /dev/block/bootdevice/by-name/misc       /misc              emmc   defaults                                         defaults
 /dev/block/bootdevice/by-name/modem      /vendor/firmware_mnt          vfat   ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait
diff --git a/rootdir/etc/fstab_AB.qcom b/rootdir/etc/fstab_AB.qcom
index c884531d..d42a8ed9 100644
--- a/rootdir/etc/fstab_AB.qcom
+++ b/rootdir/etc/fstab_AB.qcom
@@ -8,7 +8,7 @@
 # A/B fstab.qcom variant
 #<src>                                   <mnt_point>           <type> <mnt_flags and options>                          <fs_mgr_flags>
 /dev/block/bootdevice/by-name/system     /                     ext4   ro,barrier=1,discard                             wait,slotselect
-/dev/block/bootdevice/by-name/userdata   /data                 ext4   nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime   wait,check,encryptable=footer,crashcheck,quota,reservedsize=128M
+/dev/block/bootdevice/by-name/userdata   /data                 ext4   nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime   wait,check,encryptable=footer,quota,reservedsize=128M
 /dev/block/bootdevice/by-name/userdata   /data                 f2fs   nosuid,nodev,noatime,inline_xattr,reserve_root=32768,resgid=1065  wait,check,encryptable=footer,reservedsize=128M
 /devices/soc/c084000.sdhci/mmc_host*     /storage/sdcard1      vfat   nosuid,nodev                                     wait,voldmanaged=sdcard1:auto,encryptable=footer
 /dev/block/bootdevice/by-name/misc       /misc                 emmc   defaults                                         defaults