diff --git a/conf/Android.bp b/conf/Android.bp
index 12f6a14..ef95c54 100644
--- a/conf/Android.bp
+++ b/conf/Android.bp
@@ -35,9 +35,7 @@ package {
 
 genrule {
     name: "gen_fstab.zuma-hw-encrypt",
-    srcs: ["fstab.zumapro.common",
-           "fstab.zumapro.f2fs",
-    ],
+    srcs: ["fstab.zumapro.in"],
     out: ["fstab.zuma"],
     cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" +
         " -e s/@inlinecrypt@/inlinecrypt/ " +
@@ -46,9 +44,7 @@ genrule {
 
 genrule {
     name: "gen_fstab.zumapro-hw-encrypt",
-    srcs: ["fstab.zumapro.common",
-           "fstab.zumapro.f2fs",
-    ],
+    srcs: ["fstab.zumapro.in"],
     out: ["fstab.zumapro"],
     cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" +
         " -e s/@inlinecrypt@/inlinecrypt/ " +
@@ -57,9 +53,7 @@ genrule {
 
 genrule {
     name: "gen_fstab.zuma-sw-encrypt",
-    srcs: ["fstab.zumapro.common",
-           "fstab.zumapro.f2fs",
-    ],
+    srcs: ["fstab.zumapro.in"],
     out: ["fstab.zuma"],
     cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" +
         " -e s/@inlinecrypt@// " +
@@ -68,9 +62,7 @@ genrule {
 
 genrule {
     name: "gen_fstab.zumapro-sw-encrypt",
-    srcs: ["fstab.zumapro.common",
-           "fstab.zumapro.f2fs",
-    ],
+    srcs: ["fstab.zumapro.in"],
     out: ["fstab.zumapro"],
     cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" +
         " -e s/@inlinecrypt@// " +
@@ -79,9 +71,7 @@ genrule {
 
 genrule {
     name: "gen_fstab.zuma-no-encrypt",
-    srcs: ["fstab.zumapro.common",
-           "fstab.zumapro.f2fs",
-    ],
+    srcs: ["fstab.zumapro.in"],
     out: ["fstab.zuma"],
     cmd: "sed -e s/@fileencryption@//" +
         " -e s/@inlinecrypt@// " +
@@ -90,9 +80,7 @@ genrule {
 
 genrule {
     name: "gen_fstab.zumapro-no-encrypt",
-    srcs: ["fstab.zumapro.common",
-           "fstab.zumapro.f2fs",
-    ],
+    srcs: ["fstab.zumapro.in"],
     out: ["fstab.zumapro"],
     cmd: "sed -e s/@fileencryption@//" +
         " -e s/@inlinecrypt@// " +
@@ -101,9 +89,7 @@ genrule {
 
 genrule {
     name: "gen_fstab.zuma-fips",
-    srcs: ["fstab.zumapro.common",
-           "fstab.zumapro.f2fs",
-    ],
+    srcs: ["fstab.zumapro.in"],
     out: ["fstab.zuma-fips"],
     cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" +
         " -e s/@inlinecrypt@/inlinecrypt/ " +
@@ -112,9 +98,7 @@ genrule {
 
 genrule {
     name: "gen_fstab.zumapro-fips",
-    srcs: ["fstab.zumapro.common",
-           "fstab.zumapro.f2fs",
-    ],
+    srcs: ["fstab.zumapro.in"],
     out: ["fstab.zumapro-fips"],
     cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" +
         " -e s/@inlinecrypt@/inlinecrypt/ " +
diff --git a/conf/fstab.zumapro.f2fs b/conf/fstab.zumapro.f2fs
deleted file mode 100644
index 35cd6a1..0000000
--- a/conf/fstab.zumapro.f2fs
+++ /dev/null
@@ -1,8 +0,0 @@
-# Android fstab file for block devices that contain f2fs file systems.
-#
-#<src>                                                   <mnt_point>                 <type>  <mnt_flags and options>  <fs_mgr_flags>
-/dev/block/platform/13200000.ufs/by-name/efs             /mnt/vendor/efs             f2fs    noatime,sync             wait,check,formattable
-/dev/block/platform/13200000.ufs/by-name/efs_backup      /mnt/vendor/efs_backup      f2fs    noatime,sync             wait,check,formattable
-/dev/block/platform/13200000.ufs/by-name/modem_userdata  /mnt/vendor/modem_userdata  f2fs    noatime,sync             wait,check,formattable
-/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/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
diff --git a/conf/fstab.zumapro.common b/conf/fstab.zumapro.in
similarity index 70%
rename from conf/fstab.zumapro.common
rename to conf/fstab.zumapro.in
index a5521b7..779b259 100644
--- a/conf/fstab.zumapro.common
+++ b/conf/fstab.zumapro.in
@@ -14,7 +14,12 @@ vendor                                                   /vendor
 vendor_dlkm                                              /vendor_dlkm                ext4    noatime,ro                       wait,slotselect,avb=vbmeta,avb_keys=no_such_key,logical,first_stage_mount
 /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/efs             /mnt/vendor/efs             f2fs    noatime,sync             wait,check,formattable
+/dev/block/platform/13200000.ufs/by-name/efs_backup      /mnt/vendor/efs_backup      f2fs    noatime,sync             wait,check,formattable
+/dev/block/platform/13200000.ufs/by-name/modem_userdata  /mnt/vendor/modem_userdata  f2fs    noatime,sync             wait,check,formattable
 /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/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/vbmeta          /vbmeta                     emmc    defaults                 slotselect,first_stage_mount
 /devices/platform/11210000.usb*                          auto                        vfat    defaults                 voldmanaged=usb:auto