diff --git a/conf/Android.bp b/conf/Android.bp
index 58f11f32..8bc835dd 100644
--- a/conf/Android.bp
+++ b/conf/Android.bp
@@ -35,7 +35,10 @@ package {
 
 genrule {
     name: "gen_fstab.zuma-hw-encrypt",
-    srcs: ["fstab.zuma.in"],
+    srcs: [
+        "fstab.zuma.common",
+        "fstab.zuma.f2fs",
+    ],
     out: ["fstab.zuma"],
     cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" +
         " -e s/@inlinecrypt@/inlinecrypt/ " +
@@ -44,7 +47,10 @@ genrule {
 
 genrule {
     name: "gen_fstab.zuma-sw-encrypt",
-    srcs: ["fstab.zuma.in"],
+    srcs: [
+        "fstab.zuma.common",
+        "fstab.zuma.f2fs",
+    ],
     out: ["fstab.zuma"],
     cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" +
         " -e s/@inlinecrypt@// " +
@@ -53,7 +59,10 @@ genrule {
 
 genrule {
     name: "gen_fstab.zuma-no-encrypt",
-    srcs: ["fstab.zuma.in"],
+    srcs: [
+        "fstab.zuma.common",
+        "fstab.zuma.f2fs",
+    ],
     out: ["fstab.zuma"],
     cmd: "sed -e s/@fileencryption@//" +
         " -e s/@inlinecrypt@// " +
@@ -62,7 +71,10 @@ genrule {
 
 genrule {
     name: "gen_fstab.zuma-fips",
-    srcs: ["fstab.zuma.in"],
+    srcs: [
+        "fstab.zuma.common",
+        "fstab.zuma.f2fs",
+    ],
     out: ["fstab.zuma-fips"],
     cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" +
         " -e s/@inlinecrypt@/inlinecrypt/ " +
diff --git a/conf/fstab.zuma.in b/conf/fstab.zuma.common
similarity index 69%
rename from conf/fstab.zuma.in
rename to conf/fstab.zuma.common
index 903bfe47..a5521b74 100644
--- a/conf/fstab.zuma.in
+++ b/conf/fstab.zuma.common
@@ -15,10 +15,6 @@ vendor_dlkm                                              /vendor_dlkm
 /dev/block/platform/13200000.ufs/by-name/boot            /boot                       emmc    defaults                 slotselect,avb=boot,first_stage_mount
 /dev/block/platform/13200000.ufs/by-name/init_boot       /init_boot                  emmc    defaults                 slotselect,avb=init_boot,first_stage_mount
 /dev/block/platform/13200000.ufs/by-name/misc            /misc                       emmc    defaults                 wait
-/dev/block/platform/13200000.ufs/by-name/metadata        /metadata                   f2fs    noatime,nosuid,nodev,sync  wait,check,formattable,first_stage_mount
-/dev/block/platform/13200000.ufs/by-name/metadata        /metadata                   ext4    noatime,nosuid,nodev,data=journal,commit=1    wait,check,first_stage_mount,metadata_csum
 #/dev/block/platform/13200000.ufs/by-name/pvmfw           /pvmfw                      emmc    defaults                 wait,slotselect,avb=pvmfw,first_stage_mount
-/dev/block/platform/13200000.ufs/by-name/userdata        /data                       f2fs    noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache    latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device
-/dev/block/platform/13200000.ufs/by-name/userdata        /data                       ext4     noatime,nosuid,nodev,@inlinecrypt@    latemount,wait,check,quota,reservedsize=128M,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption
 /dev/block/platform/13200000.ufs/by-name/vbmeta          /vbmeta                     emmc    defaults                 slotselect,first_stage_mount
 /devices/platform/11210000.usb*                          auto                        vfat    defaults                 voldmanaged=usb:auto
diff --git a/conf/fstab.zuma.f2fs b/conf/fstab.zuma.f2fs
new file mode 100644
index 00000000..10b82262
--- /dev/null
+++ b/conf/fstab.zuma.f2fs
@@ -0,0 +1,10 @@
+# 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/platform/13200000.ufs/by-name/userdata        /data                       f2fs    noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache    latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device
+/dev/block/platform/13200000.ufs/by-name/userdata        /data                       ext4     noatime,nosuid,nodev,@inlinecrypt@    latemount,wait,check,quota,reservedsize=128M,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption
+/dev/block/platform/13200000.ufs/by-name/metadata        /metadata                   f2fs    noatime,nosuid,nodev,sync  wait,check,formattable,first_stage_mount
+/dev/block/platform/13200000.ufs/by-name/metadata        /metadata                   ext4    noatime,nosuid,nodev,data=journal,commit=1    wait,check,first_stage_mount,metadata_csum