diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index 041c251e..7cb656dc 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk
@@ -99,3 +99,10 @@ PRODUCT_SOONG_NAMESPACES += \
 ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
     TARGET_CRYPTFS_HW_PATH ?= vendor/qcom/opensource/cryptfs_hw
 endif
+
+ifeq ($(TARGET_USE_QTI_BT_STACK),true)
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/qcom/opensource/commonsys/packages/apps/Bluetooth \
+    vendor/qcom/opensource/commonsys/system/bt/conf \
+    vendor/qcom/opensource/commonsys/system/bt/main
+endif #TARGET_USE_QTI_BT_STACK
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index b9f524a1..abfb2d3b 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -59,3 +59,7 @@ SOONG_CONFIG_styxGlobalVars_qcom_display_headers_namespace := vendor/qcom/openso
 else
 SOONG_CONFIG_styxGlobalVars_qcom_display_headers_namespace := $(QCOM_SOONG_NAMESPACE)/display
 endif
+
+ifneq ($(TARGET_USE_QTI_BT_STACK),true)
+PRODUCT_SOONG_NAMESPACES += packages/apps/Bluetooth
+endif #TARGET_USE_QTI_BT_STACK