diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 00ed9eec..07ef30be 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -12,8 +12,8 @@
 # Non-A/B fstab.qcom variant
 #<src>                                                              <mnt_point>             <type>  <mnt_flags and options>                                                                             <fs_mgr_flags>
 /dev/block/zram0                                                    none                    swap    defaults                                                                                            zramsize=50%,max_comp_streams=8,zram_backingdev_size=512M
-/dev/block/bootdevice/by-name/userdata                              /data                   ext4    nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime                                     wait,check,fileencryption=ice,quota,reservedsize=128M
-/dev/block/bootdevice/by-name/userdata                              /data                   f2fs    nodev,noatime,nosuid,nodiratime,fsync_mode=nobarrier,background_gc=off                              wait,check,fileencryption=ice,quota,reservedsize=128M
+/dev/block/bootdevice/by-name/userdata                              /data                   ext4    nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime                                     wait,check,encryptable=footer,quota,reservedsize=128M
+/dev/block/bootdevice/by-name/userdata                              /data                   f2fs    nodev,noatime,nosuid,nodiratime,fsync_mode=nobarrier,background_gc=off                              wait,check,encryptable=footer,quota,reservedsize=128M
 /dev/block/bootdevice/by-name/misc                                  /misc                   emmc    defaults                                                                                            defaults
 /dev/block/bootdevice/by-name/modem                                 /vendor/firmware_mnt    vfat    ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0        wait
 /dev/block/bootdevice/by-name/bluetooth                             /vendor/bt_firmware     vfat    ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0     wait
diff --git a/rootdir/etc/fstab_AB.qcom b/rootdir/etc/fstab_AB.qcom
index 28b45d99..2c3ac03e 100644
--- a/rootdir/etc/fstab_AB.qcom
+++ b/rootdir/etc/fstab_AB.qcom
@@ -9,8 +9,8 @@
 #<src>                                                              <mnt_point>           <type>  <mnt_flags and options>                                                                         <fs_mgr_flags>
 /dev/block/zram0                                                    none                  swap    defaults                                                                                        zramsize=50%,max_comp_streams=8,zram_backingdev_size=512M
 /dev/block/bootdevice/by-name/system                                /                     ext4    ro,barrier=1,discard                                                                            wait,slotselect
-/dev/block/bootdevice/by-name/userdata                              /data                 ext4    nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime                                 wait,check,fileencryption=ice,quota,formattable,length=-16384
-/dev/block/bootdevice/by-name/userdata                              /data                 f2fs    nodev,noatime,nosuid,inline_xattr,reserve_root=32768,resgid=1065,background_gc=on               wait,check,fileencryption=ice,quota,formattable,length=-16384
+/dev/block/bootdevice/by-name/userdata                              /data                 ext4    nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime                                 wait,check,encryptable=footer,quota,formattable,length=-16384
+/dev/block/bootdevice/by-name/userdata                              /data                 f2fs    nodev,noatime,nosuid,inline_xattr,reserve_root=32768,resgid=1065,background_gc=on               wait,check,encryptable=footer,quota,formattable,length=-16384
 /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,slotselect
 /dev/block/bootdevice/by-name/bluetooth                             /vendor/bt_firmware   vfat    ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect