diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index d2248ec..777645e 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -165,9 +165,7 @@ BOARD_VNDK_VERSION := current
 DISABLE_EAP_PROXY := true

 # Verified Boot
-BOARD_AVB_ENABLE := true
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2
+BOARD_AVB_ENABLE := false

 # Inherit from the proprietary version
 -include vendor/oneplus/sm8150-common/BoardConfigVendor.mk
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 2e7a0aa..7fd36da 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -30,7 +30,7 @@
 # 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/bootdevice/by-name/system                    /                      ext4    ro,barrier=1,discard                                 wait,slotselect,avb
+/dev/block/bootdevice/by-name/system                    /                      ext4    ro,barrier=1,discard                                 wait,slotselect
 /dev/block/bootdevice/by-name/metadata                  /metadata              ext4    noatime,nosuid,nodev,discard                         wait,formattable
 /dev/block/bootdevice/by-name/userdata                  /data                  ext4    noatime,nosuid,nodev,barrier=1,noauto_da_alloc,discard latemount,wait,check,fileencryption=ice,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=512M
 /dev/block/bootdevice/by-name/userdata                   /data                 f2fs    noatime,nosuid,nodev,discard,fsync_mode=nobarrier latemount,wait,check,fileencryption=ice,keydirectory=/metadata/vold/metadata_encryption,quota,formattable,reservedsize=128M
@@ -51,4 +51,4 @@
 # and fails if it does not find it.
 /dev/block/bootdevice/by-name/misc                      /misc                  emmc    defaults                                             defaults
 /dev/block/bootdevice/by-name/boot                      /boot                  emmc    defaults                                             defaults
-/dev/block/bootdevice/by-name/recovery                  /recovery              emmc    defaults                                             defaults
\ No newline at end of file
+/dev/block/bootdevice/by-name/recovery                  /recovery              emmc    defaults                                             defaults
diff --git a/sm8150.mk b/sm8150.mk
index e8972b5..2be22fd 100644
--- a/sm8150.mk
+++ b/sm8150.mk
@@ -31,8 +31,7 @@ AB_OTA_UPDATER := true
 AB_OTA_PARTITIONS += \
     boot \
     dtbo \
-    system \
-    vbmeta
+    system

 AB_OTA_POSTINSTALL_CONFIG += \
     RUN_POSTINSTALL_system=true \