diff --git a/target/board/BoardConfigSoong.mk b/target/board/BoardConfigSoong.mk
index 65a0ac77..9fce86a5 100644
--- a/target/board/BoardConfigSoong.mk
+++ b/target/board/BoardConfigSoong.mk
@@ -2,6 +2,8 @@
 # Documentation here:
 # https://github.com/LineageOS/android_build_soong/commit/8328367c44085b948c003116c0ed74a047237a69
 
+# PA Variables
+
 SOONG_CONFIG_NAMESPACES += aospaVarsPlugin
 
 SOONG_CONFIG_aospaVarsPlugin :=
@@ -61,3 +63,8 @@ GESTURE_SOONG_VARS := \
     TARGET_SINGLE_TAP_TO_WAKE_NODE
 
 $(foreach v,$(GESTURE_SOONG_VARS),$(eval $(call add-gesturevar-if-exist,$(v))))
+
+# Qualcomm variables
+SOONG_CONFIG_NAMESPACES += aosp_vs_qva
+SOONG_CONFIG_aosp_vs_qva += aosp_or_qva
+SOONG_CONFIG_aosp_vs_qva_aosp_or_qva := qva