diff --git a/device.mk b/device.mk
index 849efe9..a015c92 100755
--- a/device.mk
+++ b/device.mk
@@ -118,6 +118,10 @@
 PRODUCT_AAPT_CONFIG := xxhdpi
 PRODUCT_AAPT_PREF_CONFIG := xxhdpi
 
+# Rootdir
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/recovery.fstab:system/etc/fstab.qcom
+
 # Netutils
 PRODUCT_PACKAGES += \
     netutils-wrapper-1.0 \
diff --git a/prebuilt/system/etc/init/init.qcom.rc b/prebuilt/system/etc/init/init.qcom.rc
index 0549591..a31adac 100644
--- a/prebuilt/system/etc/init/init.qcom.rc
+++ b/prebuilt/system/etc/init/init.qcom.rc
@@ -1,2 +1,3 @@
 on init
-    mount none /system/etc/audio_policy_configuration.xml /vendor/etc/audio/audio_policy_configuration.xml bind
\ No newline at end of file
+    mount none /system/etc/audio_policy_configuration.xml /vendor/etc/audio/audio_policy_configuration.xml bind
+    mount none /system/etc/fstab.qcom /vendor/etc/fstab.qcom bind
diff --git a/recovery.fstab b/recovery.fstab
index 91ae9dd..94ae853 100644
--- a/recovery.fstab
+++ b/recovery.fstab
@@ -8,7 +8,7 @@
 #<src>                                                 <mnt_point>            <type>  <mnt_flags and options>                            <fs_mgr_flags>
 /dev/block/bootdevice/by-name/system                    /                      ext4    ro,barrier=1,discard                                 wait,slotselect,avb
 /dev/block/bootdevice/by-name/metadata                  /metadata              ext4    noatime,nosuid,nodev,discard                         wait,formattable
-/dev/block/bootdevice/by-name/userdata                  /data                  f2fs     noatime,nosuid,nodev,discard,nobarrier        latemount,wait,check,fileencryption=ice,wrappedkey,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M
+/dev/block/bootdevice/by-name/userdata                  /data                  f2fs     noatime,nosuid,nodev,discard,nobarrier        latemount,wait,check,fileencryption=ice,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M
 /dev/block/bootdevice/by-name/persist                   /mnt/vendor/persist    ext4    noatime,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,slotselect
 /dev/block/bootdevice/by-name/dsp                       /vendor/dsp            ext4    ro,nosuid,nodev,barrier=1                            wait,slotselect