diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index b140d46..980dc1e 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -63,7 +63,6 @@ TARGET_KERNEL_SOURCE := kernel/xiaomi/sdm710
 
 # Partitions
 BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64)
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
 BOARD_DTBOIMG_PARTITION_SIZE := 25165824
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 0ad2a9e..a1da197 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -7,3 +7,12 @@ LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/init.recovery.qcom.rc
 LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := fstab.qcom_ramdisk
+LOCAL_MODULE_STEM  := fstab.qcom
+LOCAL_MODULE_TAGS  := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/fstab.qcom
+LOCAL_MODULE_PATH  := $(TARGET_RAMDISK_OUT)
+include $(BUILD_PREBUILT)
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 44f2bfe..09fd469 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -10,9 +10,9 @@
 /dev/block/bootdevice/by-name/recovery                  /recovery                emmc    defaults                                             defaults
 /dev/block/bootdevice/by-name/misc                      /misc                    emmc    defaults                                             defaults
 /dev/block/bootdevice/by-name/cache                     /cache                   ext4    nosuid,noatime,nodev,barrier=1                       wait
-/dev/block/bootdevice/by-name/system                    /                        ext4    ro,barrier=1,discard                                 wait
-/dev/block/bootdevice/by-name/vendor                    /vendor                  ext4    ro,barrier=1                                         wait,recoveryonly
-/dev/block/bootdevice/by-name/userdata                  /data                    ext4    noatime,nosuid,noatime,nodev,barrier=1,noauto_da_alloc,lazytime       latemount,wait,check,fileencryption=ice,quota,reservedsize=128M
+/dev/block/bootdevice/by-name/system                    /system                  ext4    ro,barrier=1,discard                                 wait,first_stage_mount
+/dev/block/bootdevice/by-name/vendor                    /vendor                  ext4    ro,barrier=1                                         wait,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/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
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 16fc559..1161e85 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -52,7 +52,7 @@ on init
 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 --early
+    mount_all /vendor/etc/fstab.qcom
     chown root system /mnt/vendor/persist
     chmod 0771 /mnt/vendor/persist
     restorecon_recursive /mnt/vendor/persist
@@ -80,9 +80,6 @@ service sec_nvm /vendor/bin/sec_nvm
     user system
     group system
 
-on late-fs
-    mount_all /vendor/etc/fstab.qcom --late
-
 on post-fs-data
     mkdir /data/tombstones 0771 system system
     mkdir /tombstones/modem 0771 system system
diff --git a/sdm710.mk b/sdm710.mk
index fac7073..4c5dd7b 100644
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -224,7 +224,8 @@ PRODUCT_PACKAGES += \
 
 # Rootdir
 PRODUCT_PACKAGES += \
-    fstab.qcom
+    fstab.qcom \
+    fstab.qcom_ramdisk
 
 PRODUCT_PACKAGES += \
     init.class_main.sh \