diff --git a/rootdir/etc/fstab.default b/rootdir/etc/fstab.default
index 86a13de..8212788 100644
--- a/rootdir/etc/fstab.default
+++ b/rootdir/etc/fstab.default
@@ -33,9 +33,9 @@
 # Currently we dont have e2fsck compiled. So fs check would failed.
 
 #<src>                                                 <mnt_point>               <type>  <mnt_flags and options>                            <fs_mgr_flags>
-system                                                  /system                  ext4    ro,barrier=1,discard                                 wait,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
-system_ext                                              /system_ext              ext4    ro,barrier=1,discard                                 wait,avb=vbmeta_system,logical,first_stage_mount
-product                                                 /product                 ext4    ro,barrier=1,discard                                 wait,avb=vbmeta_system,logical,first_stage_mount
+system                                                  /system                  ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
+system_ext                                              /system_ext              ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
+product                                                 /product                 ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
 vendor                                                  /vendor                  ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
 odm                                                     /odm                     ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
 /dev/block/bootdevice/by-name/cache                     /cache                   ext4    nosuid,noatime,nodev,barrier=1                       wait
diff --git a/rootdir/etc/fstab.emmc b/rootdir/etc/fstab.emmc
index 79fc308..c5acafc 100644
--- a/rootdir/etc/fstab.emmc
+++ b/rootdir/etc/fstab.emmc
@@ -33,9 +33,9 @@
 # Currently we dont have e2fsck compiled. So fs check would failed.
 
 #<src>                                                 <mnt_point>               <type>  <mnt_flags and options>                            <fs_mgr_flags>
-system                                                  /system                  ext4    ro,barrier=1,discard                                 wait,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
-system_ext                                              /system_ext              ext4    ro,barrier=1,discard                                 wait,avb=vbmeta_system,logical,first_stage_mount
-product                                                 /product                 ext4    ro,barrier=1,discard                                 wait,avb=vbmeta_system,logical,first_stage_mount
+system                                                  /system                  ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
+system_ext                                              /system_ext              ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
+product                                                 /product                 ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
 vendor                                                  /vendor                  ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
 odm                                                     /odm                     ext4    ro,barrier=1,discard                                 wait,avb,logical,first_stage_mount
 /dev/block/bootdevice/by-name/cache                     /cache                   ext4    nosuid,noatime,nodev,barrier=1                       wait