diff --git a/BoardConfig.mk b/BoardConfig.mk
index 83e5552..a8d4241 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -36,6 +36,7 @@ BOARD_KERNEL_CMDLINE += androidboot.dtbo_idx=3
 
 # Partitions (listed in the file) to be wiped under recovery.
 TARGET_RECOVERY_WIPE := device/google/walleye/recovery.wipe
+TARGET_RECOVERY_FSTAB := device/google/walleye/fstab.hardware
 
 #BOARD_EXT4_SHARE_DUP_BLOCKS := true
 
diff --git a/device.mk b/device.mk
index 6d53a56..90a5934 100644
--- a/device.mk
+++ b/device.mk
@@ -120,6 +120,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_COPY_FILES += \
     device/google/walleye/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json
 
+# Fstab Hardware
+PRODUCT_COPY_FILES += \
+    device/google/walleye/fstab.hardware:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.$(PRODUCT_HARDWARE) \
+    device/google/walleye/fstab.hardware:$(TARGET_COPY_OUT_RECOVERY)/root/first_stage_ramdisk/fstab.$(PRODUCT_HARDWARE)
+
 # VNDK
 PRODUCT_COPY_FILES += \
     prebuilts/vndk/v32/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libhidlbase-v32.so \
diff --git a/fstab.hardware b/fstab.hardware
new file mode 100644
index 0000000..17be4df
--- /dev/null
+++ b/fstab.hardware
@@ -0,0 +1,13 @@
+# Android fstab file.
+
+#<src>                                                     <mnt_point>        <type>      <mnt_flags and options>                               <fs_mgr_flags>
+/dev/block/by-name/system                                  /system            ext4        ro,barrier=1                                          wait,slotselect,avb,first_stage_mount
+/dev/block/by-name/vendor                                  /vendor            ext4        ro,barrier=1                                          wait,slotselect,avb,first_stage_mount
+/dev/block/by-name/product                                 /product           ext4        ro,barrier=1                                          wait,slotselect,avb,first_stage_mount
+/dev/block/by-name/persist                                 /persist           ext4        nosuid,nodev,noatime,barrier=1                        wait
+/dev/block/platform/soc/1da4000.ufshc/by-name/metadata     /metadata          ext4        noatime,nosuid,nodev,discard,sync                     wait,formattable
+/dev/block/platform/soc/1da4000.ufshc/by-name/userdata     /data              ext4        errors=panic,noatime,nosuid,nodev,barrier=1,noauto_da_alloc        latemount,wait,check,formattable,fileencryption=ice:aes-256-heh,eraseblk=16777216,logicalblk=4096,quota,reservedsize=128M,checkpoint=block
+/dev/block/platform/soc/1da4000.ufshc/by-name/misc         /misc              emmc        defaults                                              defaults
+/dev/block/platform/soc/1da4000.ufshc/by-name/modem        /firmware          vfat        ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0   wait,slotselect
+/devices/soc/a800000.ssusb/a800000.dwc3*                   auto               vfat        defaults                                              voldmanaged=usb:auto
+/dev/block/zram0                                           none               swap        defaults                                              zramsize=2147483648,max_comp_streams=8
\ No newline at end of file