diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index f787517..68ead0e 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -12,7 +12,7 @@
 /dev/block/bootdevice/by-name/modem          /vendor/firmware_mnt    ext4    ro,nosuid,nodev,barrier=0                                                          wait
 /dev/block/bootdevice/by-name/fsg            /fsg                    ext4    ro,nosuid,nodev                                                                    wait
 /dev/block/bootdevice/by-name/dsp            /vendor/dsp             ext4    ro,nosuid,nodev,barrier=1                                                          wait
-/dev/block/bootdevice/by-name/persist        /persist                ext4    nosuid,nodev,barrier=1,noatime,noauto_da_alloc                                     wait
+/dev/block/bootdevice/by-name/persist        /mnt/vendor/persist     ext4    nosuid,nodev,barrier=1,noatime,noauto_da_alloc                                     wait
 /dev/block/bootdevice/by-name/boot           /boot                   emmc    defaults                                                                           recoveryonly
 /dev/block/bootdevice/by-name/recovery       /recovery               emmc    defaults                                                                           recoveryonly
 /dev/block/bootdevice/by-name/misc           /misc                   emmc    defaults                                                                           defaults
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 3d701ec..c8d8784 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -45,13 +45,11 @@ on fs
     mount_all /vendor/etc/fstab.qcom
     write /proc/sys/vm/swappiness 100
 
-    # Keeping following partitions outside fstab file. As user may not have
-    # these partition flashed on the device. Failure to mount any partition in fstab file
-    # results in failure to launch late-start class.
-
-    wait /dev/block/bootdevice/by-name/persist
-    mkdir /persist/data 0700  system system
-    restorecon_recursive   /persist
+    chown root system /mnt/vendor/persist
+    chmod 0771 /mnt/vendor/persist
+    mkdir /mnt/vendor/persist/data 0700 system system
+    mkdir /mnt/vendor/persist/bms 0700 root system
+    restorecon_recursive /mnt/vendor/persist
 
     wait /dev/block/bootdevice/by-name/dsp
     restorecon_recursive   /dsp