diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index eb02cdb7..668db029 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -66,7 +66,8 @@ AB_OTA_PARTITIONS += \
     system \
     vbmeta \
     dtbo \
-    product
+    product \
+    vbmeta_system
 
 # Partitions (listed in the file) to be wiped under recovery.
 TARGET_RECOVERY_WIPE := device/google/redbull/recovery.wipe
diff --git a/gpt-utils/gpt-utils.h b/gpt-utils/gpt-utils.h
index fccf544a..39e78b51 100644
--- a/gpt-utils/gpt-utils.h
+++ b/gpt-utils/gpt-utils.h
@@ -82,7 +82,8 @@ extern "C" {
 #define PTN_SWAP_LIST                   PTN_XBL, \
             "abl", "aop", "devcfg", \
             "dtbo", "hyp", "keymaster", "qupfw", "tz", \
-            "uefisecapp", "vbmeta", "xbl_config", "featenabler"
+            "uefisecapp", "vbmeta", "vbmeta_system", "xbl_config", \
+            "featenabler"
 
 #define AB_PTN_LIST PTN_SWAP_LIST, "boot", "system", "vendor", "modem", "product"
 #define BOOT_DEV_DIR    "/dev/block/bootdevice/by-name"