diff --git a/BoardConfig.mk b/BoardConfig.mk
index d0b9b45..a09decc 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -108,11 +108,5 @@ TARGET_COPY_OUT_VENDOR := vendor
 
 # Verified Boot
 BOARD_AVB_ENABLE := true
-ifeq ($(BOARD_AVB_ENABLE), true)
-   BOARD_AVB_RECOVERY_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
-   BOARD_AVB_RECOVERY_ALGORITHM := SHA256_RSA4096
-   BOARD_AVB_RECOVERY_ROLLBACK_INDEX := 1
-   BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 1
-   BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flag 2
-   BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag
-endif
+BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag
+BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2