diff --git a/bt-commonsys-intf-board.mk b/bt-commonsys-intf-board.mk
index 02b7c89..f1a79c7 100644
--- a/bt-commonsys-intf-board.mk
+++ b/bt-commonsys-intf-board.mk
@@ -11,6 +11,7 @@
 TARGET_USE_QTI_BT_CONFIGSTORE := true
 TARGET_USE_QTI_BT_SAR := true
 TARGET_USE_QTI_VND_FWK_DETECT := true
+TARGET_USE_BT_DUN := false
 
 ifeq ($(TARGET_USES_QMAA),true)
 ifneq ($(TARGET_USES_QMAA_OVERRIDE_BLUETOOTH),true)
diff --git a/bt-commonsys-intf-legacy-aosp-board.mk b/bt-commonsys-intf-legacy-aosp-board.mk
index f54ab6c..ddd2607 100644
--- a/bt-commonsys-intf-legacy-aosp-board.mk
+++ b/bt-commonsys-intf-legacy-aosp-board.mk
@@ -8,3 +8,4 @@
 TARGET_USE_QTI_BT_CONFIGSTORE := false
 TARGET_USE_QTI_BT_SAR := false
 TARGET_USE_QTI_VND_FWK_DETECT := false
+TARGET_USE_BT_DUN := false
diff --git a/bt-commonsys-intf-legacy-board.mk b/bt-commonsys-intf-legacy-board.mk
index f9f0a8b..0e93c12 100644
--- a/bt-commonsys-intf-legacy-board.mk
+++ b/bt-commonsys-intf-legacy-board.mk
@@ -21,6 +21,7 @@
 TARGET_USE_QTI_BT_CONFIGSTORE := true
 TARGET_USE_QTI_BT_SAR := true
 TARGET_USE_QTI_VND_FWK_DETECT := true
+TARGET_USE_BT_DUN := false
 
 ifeq ($(TARGET_BOARD_PLATFORM),msm8937)
 ifeq ($(TARGET_BOARD_SUFFIX),_32go)
diff --git a/bt-system-opensource-product.mk b/bt-system-opensource-product.mk
index 6eed6e2..be5d98e 100644
--- a/bt-system-opensource-product.mk
+++ b/bt-system-opensource-product.mk
@@ -27,7 +27,11 @@
 PRODUCT_PACKAGES += vendor.qti.hardware.btconfigstore@1.0
 PRODUCT_PACKAGES += com.qualcomm.qti.bluetooth_audio@1.0
 PRODUCT_PACKAGES += vendor.qti.hardware.bluetooth_audio@2.0
+
+ifeq ($(TARGET_USE_BT_DUN),true)
 PRODUCT_PACKAGES += vendor.qti.hardware.bluetooth_dun-V1.0-java
+PRODUCT_PACKAGES += BluetoothExt
+endif #TARGET_USE_BT_DUN
 
 PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/commonsys/packages/apps/Bluetooth
 PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/commonsys/system/bt/conf