diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4057b4445e6ef2a2c88465fd2870f8cc8f2c3bef..7846ea0f4bc1aeb73e251ebfc82cf4c21a79e4c6 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -140,7 +140,6 @@ TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_onclite
 TARGET_RECOVERY_DEVICE_MODULES := libinit_onclite
 
 # Partitions
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3758096384
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 1f8eb55583c98dcbd1ebec53435150b59e25a573..c6441f526c63b036f5649b5abf800aded8403bed 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -7,9 +7,19 @@ LOCAL_MODULE       := fstab.qcom
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/fstab.qcom
+LOCAL_REQUIRED_MODULES := fstab.qcom_ramdisk
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)
 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)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE	   := init.msm.usb.configfs.rc
 LOCAL_MODULE_TAGS  := optional
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 7a1919830cb69c099ce30667c47d94ac4290adef..adcc7038ddd6c2869d2b144c13acbfbba7aaf906 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -42,10 +42,10 @@
 /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     noatime,nosuid,nodev,barrier=1                                                                   wait,check
 /dev/block/bootdevice/by-name/recovery        /recovery                   emmc     defaults                                                                                         recoveryonly
-/dev/block/bootdevice/by-name/system          /                           ext4     ro,barrier=1,discard                                                                             wait,avb
 /dev/block/bootdevice/by-name/userdata        /data                       ext4     noatime,nosuid,nodev,barrier=1,noauto_da_alloc                                                   latemount,wait,check,formattable,fileencryption=ice,quota,reservedsize=128M
 /dev/block/bootdevice/by-name/userdata        /data                       f2fs     noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier                 latemount,wait,check,formattable,fileencryption=ice,quota,reservedsize=128M
-/dev/block/bootdevice/by-name/vendor          /vendor                     ext4     ro,barrier=1                                                                                     wait,recoveryonly
+/dev/block/by-name/system                     /system                     ext4     ro,barrier=1,discard                                                                             wait,avb,first_stage_mount
+/dev/block/by-name/vendor                     /vendor                     ext4     ro,barrier=1                                                                                     wait,first_stage_mount
 
 /devices/platform/soc/7000000.ssusb/7000000.dwc3/xhci-hcd.0.auto*         auto     auto     defaults     wait,voldmanaged=usbotg:auto
 /devices/platform/soc/7864900.sdhci/mmc_host*                             auto     auto     defaults     wait,voldmanaged=sdcard1:auto,noemulatedsd,encryptable=footer