diff --git a/bt-system-opensource-product.mk b/bt-system-opensource-product.mk
index db9fb60..64fbddf 100644
--- a/bt-system-opensource-product.mk
+++ b/bt-system-opensource-product.mk
@@ -44,15 +44,15 @@
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := vendor/qcom/opensource/commonsys-intf/bluetooth/build/qva/config
 
 # BT Related Test app & Tools
-PRODUCT_PACKAGES_DEBUG += btsnoop
-PRODUCT_PACKAGES_DEBUG += gatt_tool_qti_internal
-PRODUCT_PACKAGES_DEBUG += l2cap_coc_tool
-PRODUCT_PACKAGES_DEBUG += l2test_ertm
-PRODUCT_PACKAGES_DEBUG += rfc
+PRODUCT_PACKAGES_ENG += btsnoop
+PRODUCT_PACKAGES_ENG += gatt_tool_qti_internal
+PRODUCT_PACKAGES_ENG += l2cap_coc_tool
+PRODUCT_PACKAGES_ENG += l2test_ertm
+PRODUCT_PACKAGES_ENG += rfc
 
 ifneq ($(TARGET_HAS_LOW_RAM), true)
-PRODUCT_PACKAGES_DEBUG += BTTestApp
-PRODUCT_PACKAGES_DEBUG += BATestApp
+PRODUCT_PACKAGES_ENG += BTTestApp
+PRODUCT_PACKAGES_ENG += BATestApp
 endif #TARGET_HAS_LOW_RAM
 
 else