diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 943ea084..2408b1e9 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -19,6 +19,11 @@ include build/make/target/board/BoardConfigPixelCommon.mk
 # Should be uncommented after fixing vndk-sp violation is fixed.
 PRODUCT_FULL_TREBLE_OVERRIDE := true
 
+# This prop, when set to 1, will prevent OTA tooling from generating a VABC OTA,
+# even if device actually supports it.
+# Remove this once P21 decides to use VABC OTA
+BOARD_DONT_USE_VABC_OTA := true
+
 # HACK : To fix up after bring up multimedia devices.
 TARGET_SOC := gs101