diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ed76223..6bb49cf 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -122,8 +122,7 @@ TARGET_COPY_OUT_VENDOR := vendor
 
 # 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_MAKE_VBMETA_IMAGE_ARGS += --flags 3
 BOARD_AVB_RECOVERY_ALGORITHM := SHA256_RSA4096
 BOARD_AVB_RECOVERY_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
 BOARD_AVB_RECOVERY_ROLLBACK_INDEX := 1