diff --git a/board/recovery.mk b/board/recovery.mk
index f29026c..9758261 100644
--- a/board/recovery.mk
+++ b/board/recovery.mk
@@ -1,2 +1,2 @@
 # Recovery
-TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/fstab.qcom
+TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/fstab.full
diff --git a/rootdir/fstab.full b/rootdir/fstab.full
new file mode 100644
index 0000000..66b7208
--- /dev/null
+++ b/rootdir/fstab.full
@@ -0,0 +1,21 @@
+# Android fstab file.
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+#<src>                                       <mnt_point>        <type>  <mnt_flags and options>                             <fs_mgr_flags>
+/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/system         /system            ext4    ro                                                  wait
+/dev/block/bootdevice/by-name/userdata       /data              f2fs    rw,nosuid,nodev,noatime                             wait,formattable,check,encryptable=footer
+/dev/block/bootdevice/by-name/userdata       /data              ext4    rw,nosuid,nodev,noatime,noauto_da_alloc             wait,formattable,check,encryptable=footer
+/dev/block/bootdevice/by-name/cache          /cache             f2fs    nosuid,nodev,noatime,inline_xattr                   wait,formattable,check
+/dev/block/bootdevice/by-name/cache          /cache             ext4    nosuid,nodev,noatime                                wait,formattable,check
+/dev/block/bootdevice/by-name/persist        /persist           ext4    nosuid,nodev                                        wait,check
+/dev/block/bootdevice/by-name/dsp            /dsp               ext4    ro,nosuid,nodev                                     wait
+/dev/block/bootdevice/by-name/modem          /firmware          vfat    ro,context=u:object_r:firmware_file:s0,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337 wait
+/dev/block/bootdevice/by-name/misc           /misc              emmc    defaults                                            defaults
+/dev/block/bootdevice/by-name/config         /frp               emmc    defaults                                            defaults
+
+/devices/soc/7864900.sdhci/mmc_host*         auto               auto    nosuid,nodev                                        wait,voldmanaged=sdcard1:auto,noemulatedsd,encryptable=footer
+/devices/soc/78db000.usb/msm_hsusb_host*     auto               auto    nosuid,nodev                                        wait,voldmanaged=usbotg:auto
+/dev/block/zram0                             none               swap    defaults                                            zramsize=536870912,max_comp_streams=4
diff --git a/rootdir/fstab.qcom b/rootdir/fstab.qcom
index 1692366..38e268d 100644
--- a/rootdir/fstab.qcom
+++ b/rootdir/fstab.qcom
@@ -1,11 +1,13 @@
 # Android fstab file.
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+# The filesystem that contains the filesystem e2fsck binary (typically /system) cannot
+# specify 'check', and must come before any filesystems that do specify 'check'
+
+# NOTE: /system partition is now early-mounted and the fstab entry is specified in device tree:
+#       /proc/device-tree/firmware/android/fstab/system
 
 #<src>                                       <mnt_point>        <type>  <mnt_flags and options>                             <fs_mgr_flags>
 /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/system         /system            ext4    ro                                                  wait
 /dev/block/bootdevice/by-name/userdata       /data              f2fs    rw,nosuid,nodev,noatime                             wait,formattable,check,encryptable=footer
 /dev/block/bootdevice/by-name/userdata       /data              ext4    rw,nosuid,nodev,noatime,noauto_da_alloc             wait,formattable,check,encryptable=footer
 /dev/block/bootdevice/by-name/cache          /cache             f2fs    nosuid,nodev,noatime,inline_xattr                   wait,formattable,check
@@ -16,6 +18,6 @@
 /dev/block/bootdevice/by-name/misc           /misc              emmc    defaults                                            defaults
 /dev/block/bootdevice/by-name/config         /frp               emmc    defaults                                            defaults
 
-/devices/soc/7864900.sdhci/mmc_host*         auto   		auto    nosuid,nodev                                        wait,voldmanaged=sdcard1:auto,noemulatedsd,encryptable=footer
-/devices/soc/78db000.usb/msm_hsusb_host*     auto    		auto    nosuid,nodev                                        wait,voldmanaged=usbotg:auto
+/devices/soc/7864900.sdhci/mmc_host*         auto               auto    nosuid,nodev                                        wait,voldmanaged=sdcard1:auto,noemulatedsd,encryptable=footer
+/devices/soc/78db000.usb/msm_hsusb_host*     auto               auto    nosuid,nodev                                        wait,voldmanaged=usbotg:auto
 /dev/block/zram0                             none               swap    defaults                                            zramsize=536870912,max_comp_streams=4