diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index dd77951..324e6f6 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -77,3 +77,8 @@ TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
 # Verified Boot
 BOARD_AVB_ENABLE := true
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3
+BOARD_AVB_VBMETA_SYSTEM := system system_ext product
+BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
+BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
+BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
+BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
diff --git a/bengal.mk b/bengal.mk
index bb66a7a..7232b8f 100644
--- a/bengal.mk
+++ b/bengal.mk
@@ -16,6 +16,7 @@ AB_OTA_PARTITIONS += \
     system \
     system_ext \
     vbmeta \
+    vbmeta_system \
     vendor \
     vendor_boot