diff --git a/BoardConfig.mk b/BoardConfig.mk
index 64d3cfa..60a39a9 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -13,9 +13,6 @@ DEVICE_PATH := device/xiaomi/whyred
 TARGET_SCREEN_HEIGHT := 2160
 TARGET_SCREEN_WIDTH := 1080
 
-# Crypto
-TARGET_HW_DISK_ENCRYPTION := true
-
 # Display
 TARGET_SCREEN_DENSITY := 440
 
diff --git a/device.mk b/device.mk
index d72ec4d..9b9fe37 100644
--- a/device.mk
+++ b/device.mk
@@ -30,10 +30,6 @@ PRODUCT_PACKAGES += \
     android.hardware.gatekeeper@1.0-impl \
     android.hardware.gatekeeper@1.0-service
 
-# HW crypto
-PRODUCT_PACKAGES += \
-    vendor.qti.hardware.cryptfshw@1.0-service-qti.qsee
-
 # Keymaster
 PRODUCT_PACKAGES += \
     android.hardware.keymaster@3.0-impl \
diff --git a/manifest.xml b/manifest.xml
index 5297692..cd9f427 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -9,9 +9,4 @@
         <transport>hwbinder</transport>
         <fqname>@1.0::IGoodixBiometricsFingerprint/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>vendor.qti.hardware.cryptfshw</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::ICryptfsHw/default</fqname>
-    </hal>
 </manifest>
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 34cfa63..8558d38 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,errors=panic                    wait,check,encryptable=footer,quota
-/dev/block/bootdevice/by-name/userdata                   /data                f2fs    nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier                             wait,quota,encryptable=footer
+/dev/block/bootdevice/by-name/userdata                   /data                ext4    nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime,errors=panic                    wait,check,fileencryption=ice,quota
+/dev/block/bootdevice/by-name/userdata                   /data                f2fs    nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier                             wait,quota,fileencryption=ice
 /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
@@ -21,7 +21,7 @@
 /dev/block/bootdevice/by-name/cache                      /cache               ext4    nosuid,nodev,noatime,barrier=1                                                                  wait
 /dev/block/bootdevice/by-name/cache                      /cache               f2fs    nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier                             wait,quota
 /dev/block/bootdevice/by-name/persist                    /mnt/vendor/persist  ext4    nosuid,nodev,barrier=1,noatime                                                                  wait,check
-/devices/soc/c084000.sdhci/mmc_host*                     auto                 auto    nosuid,nodev                                                                                    wait,voldmanaged=sdcard1:auto,encryptable=footer
+/devices/soc/c084000.sdhci/mmc_host*                     auto                 auto    nosuid,nodev                                                                                    wait,voldmanaged=sdcard1:auto,encryptable=userdata
 
 /dev/block/bootdevice/by-name/system                     /system              ext4    ro,barrier=1                                                                                    wait,recoveryonly
 /dev/block/bootdevice/by-name/vendor                     /vendor              ext4    ro,barrier=1                                                                                    wait,recoveryonly