diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index bcb2958..4036c5c 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -15,12 +15,12 @@
 
 /dev/block/bootdevice/by-name/cache                     /cache                   ext4    nosuid,noatime,nodev,barrier=1                       wait
 /dev/block/by-name/logdump                              /metadata                ext4    noatime,nosuid,nodev,discard                         wait,check,formattable,first_stage_mount
-/dev/block/bootdevice/by-name/userdata                  /data                    ext4    noatime,nosuid,noatime,nodev,barrier=1,noauto_da_alloc,lazytime       wait,check,fileencryption=ice,quota,reservedsize=128M
+/dev/block/bootdevice/by-name/userdata                  /data                    ext4    noatime,nosuid,noatime,nodev,barrier=1,noauto_da_alloc,lazytime       latemount,wait,check,formattable,fileencryption=::v1,quota,reservedsize=128M
 
 /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
 /dev/block/bootdevice/by-name/dsp                       /vendor/dsp              ext4    ro,nosuid,nodev,barrier=1                            wait
 /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
 /dev/block/bootdevice/by-name/persist                   /mnt/vendor/persist      ext4    nosuid,noatime,nodev,barrier=1                       wait,check
 
-/devices/platform/soc/8804000.sdhci/mmc_host*                         /storage/sdcard1   vfat    nosuid,nodev    wait,voldmanaged=sdcard1:auto,encryptable=footer
+/devices/platform/soc/8804000.sdhci/mmc_host*                         /storage/sdcard1   vfat    nosuid,nodev    wait,voldmanaged=sdcard1:auto
 /devices/platform/soc/a600000.ssusb/a600000.dwc3/xhci-hcd.*.auto*     /storage/usbotg    vfat    nosuid,nodev    wait,voldmanaged=usbotg:auto
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index cca4356..5cf3187 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -49,10 +49,14 @@ on init
     write /dev/stune/top-app/schedtune.colocate 1
     write /sys/module/qpnp_rtc/parameters/poweron_alarm 1
 
+on early-fs
+    # We need vold early for metadata encryption
+    start vold
+
 on fs
     wait /dev/block/platform/soc/${ro.boot.bootdevice}
     symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice
-    mount_all /vendor/etc/fstab.qcom
+    mount_all /vendor/etc/fstab.qcom --early
     chown root system /mnt/vendor/persist
     chmod 0771 /mnt/vendor/persist
     restorecon_recursive /mnt/vendor/persist
@@ -69,6 +73,13 @@ on fs
     chown system system /proc/tp_selftest
     chmod 0644 /proc/tp_selftest
 
+on late-fs
+    # Wait for keymaster
+    exec_start wait_for_keymaster
+
+    # Mount RW partitions which need run fsck
+    mount_all /vendor/etc/fstab.qcom --late
+
 on post-fs
     # set RLIMIT_MEMLOCK to 64MB
     setrlimit 8 67108864 67108864
diff --git a/vendor.prop b/vendor.prop
index 32a178a..67fe8c3 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -133,6 +133,11 @@ ro.bluetooth.wipower=true
 # CNE
 persist.vendor.cne.feature=1
 
+# Crypto
+ro.crypto.dm_default_key.options_format.version=1
+ro.crypto.volume.metadata.method=dm-default-key
+ro.crypto.volume.options=::v1
+
 # Display post-processing
 ro.vendor.display.ad=1
 ro.vendor.display.ad.hdr_calib_data=/vendor/etc/hdr_config.cfg