diff --git a/rootdir/etc/fstab.default b/rootdir/etc/fstab.default
index fb5bf9b..6512f44 100644
--- a/rootdir/etc/fstab.default
+++ b/rootdir/etc/fstab.default
@@ -41,9 +41,9 @@ odm                                                     /odm
 /dev/block/bootdevice/by-name/boot    /boot   emmc  defaults                        defaults
 /dev/block/bootdevice/by-name/recovery    /recovery   emmc  defaults                        defaults
 /dev/block/bootdevice/by-name/cache	/cache	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	wait,check
-/dev/block/by-name/metadata	/metadata	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic,sync	wait,formattable,wrappedkey,first_stage_mount,check
+/dev/block/by-name/metadata	/metadata	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic,sync	wait,formattable,first_stage_mount,check
 # Add fs_mgr flag - sysfs_path=/sys/devices/platform/soc/xxxx.[ufshc|sdhci] to userdata entry, based on UFS|eMMC device.
-/dev/block/bootdevice/by-name/userdata	/data	f2fs	noatime,nosuid,nodev,discard,usrquota,grpquota,fsync_mode=nobarrier,reserve_root=32768,resgid=5678	latemount,wait,check,,encryptable=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,wrappedkey,quota,reservedsize=128M,checkpoint=fs,keydirectory=/metadata/vold/metadata_encryption
+/dev/block/bootdevice/by-name/userdata	/data	f2fs	noatime,nosuid,nodev,discard,usrquota,grpquota,fsync_mode=nobarrier,reserve_root=32768,resgid=5678,inlinecrypt	latemount,wait,check,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,quota,reservedsize=128M,checkpoint=fs,metadata_encryption=aes-256-xts,keydirectory=/metadata/vold/metadata_encryption
 /dev/block/platform/soc/1d84000.ufshc/by-name/prism     /prism                   ext4    ro,barrier=1,discard                                 nofail,first_stage_mount
 /dev/block/platform/soc/1d84000.ufshc/by-name/optics    /optics                  ext4    ro,barrier=1,discard                                 nofail,first_stage_mount
 /dev/block/bootdevice/by-name/apnhlos                   /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/vendor.prop b/vendor.prop
index 8a7ffa4..a2a487c 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -84,6 +84,10 @@ ro.camera.notify_nfc=1
 ro.soc.manufacturer=Qualcomm
 ro.soc.model=SM7125
 
+# Crypto
+ro.crypto.metadata_init_delete_all_keys.enabled=false
+ro.crypto.volume.filenames_mode=aes-256-cts
+
 # Dalvik VM
 dalvik.vm.heapgrowthlimit=256m
 dalvik.vm.heapstartsize=8m