diff --git a/BoardConfig.mk b/BoardConfig.mk
index e611ca1..7f689c3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -46,6 +46,9 @@ TARGET_HAS_NO_WLAN_STATS := true
 TARGET_SYSTEM_EXT_PROP += $(DEVICE_PATH)/system_ext.prop
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 
+# Recovery
+TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/init/fstab.qcom
+
 # RIL
 ENABLE_VENDOR_RIL_SERVICE := true
 
diff --git a/device.mk b/device.mk
index faf0bd8..b473aa6 100644
--- a/device.mk
+++ b/device.mk
@@ -60,6 +60,8 @@ PRODUCT_PACKAGES += \
 
 # Init
 PRODUCT_PACKAGES += \
+    fstab.qcom \
+    fstab.qcom.ramdisk \
     init.payton.rc \
     init.recovery.payton.rc
 
diff --git a/init/Android.bp b/init/Android.bp
index c310120..c76a4b6 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -3,6 +3,13 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+prebuilt_etc {
+    name: "fstab.qcom",
+    src: "fstab.qcom",
+    vendor: true,
+    ramdisk_available: true,
+}
+
 prebuilt_etc {
     name: "init.payton.rc",
     src: "init.payton.rc",
diff --git a/init/fstab.qcom b/init/fstab.qcom
new file mode 100644
index 0000000..194681d
--- /dev/null
+++ b/init/fstab.qcom
@@ -0,0 +1,23 @@
+# 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
+
+#TODO: Add 'check' as fs_mgr_flags with data partition.
+# Currently we dont have e2fsck compiled. So fs check would failed.
+
+#<src>                                   <mnt_point>        <type> <mnt_flags and options>                          <fs_mgr_flags>
+/dev/block/by-name/system                /system            ext4   ro,barrier=1,discard                             wait,slotselect,first_stage_mount
+/dev/block/by-name/oem                   /vendor            squashfs   ro,barrier=1,discard                             wait,slotselect,first_stage_mount
+/dev/block/bootdevice/by-name/userdata   /data              ext4   nobarrier,noatime,nosuid,nodev,discard,data=ordered,noauto_da_alloc   wait,check,formattable,latemount,fileencryption=ice,quota,reservedsize=128M
+/dev/block/zram0                         none               swap   defaults                                         zramsize=25%
+/dev/block/bootdevice/by-name/misc       /misc              emmc   defaults                                         defaults
+/dev/block/bootdevice/by-name/modem      /vendor/firmware_mnt      ext4   ro,nosuid,nodev,context=u:object_r:firmware_file:s0 wait,slotselect
+/dev/block/bootdevice/by-name/bluetooth  /vendor/bt_firmware       ext4   ro,nosuid,nodev,context=u:object_r:bt_firmware_file:s0 wait,slotselect
+/dev/block/bootdevice/by-name/dsp        /vendor/dsp               ext4   ro,nosuid,nodev,barrier=1,defcontext=u:object_r:adsprpcd_file:s0 wait,slotselect
+/dev/block/bootdevice/by-name/persist    /mnt/vendor/persist       ext4   noatime,nosuid,nodev,no_sehash_xattr,barrier=1               wait
+/dev/block/bootdevice/by-name/fsg        /vendor/fsg        ext4   ro,nosuid,nodev,context=u:object_r:fsg_firmware_file:s0   wait,slotselect
+
+# Removeable
+/devices/soc/c084000.sdhci/mmc_host*     auto               auto   defaults                                         wait,voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/soc/c0a4900.sdhci/mmc_host*     auto               auto   defaults                                         wait,voldmanaged=sdcard1:auto
+/devices/*/xhci-hcd.*.auto/usb*          auto               auto   defaults                                         voldmanaged=usb:auto