diff --git a/audio/tangorpro/audio-tables.mk b/audio/tangorpro/audio-tables.mk
index 2e0f627..3c81b25 100644
--- a/audio/tangorpro/audio-tables.mk
+++ b/audio/tangorpro/audio-tables.mk
@@ -81,7 +81,7 @@ PRODUCT_COPY_FILES += \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_external_speaker_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_external_speaker_config.pb
 
 # userdebug specific
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_COPY_FILES += \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \
diff --git a/bluetooth/syna_default.mk b/bluetooth/syna_default.mk
index 8d6c2b1..7f45d17 100644
--- a/bluetooth/syna_default.mk
+++ b/bluetooth/syna_default.mk
@@ -16,7 +16,7 @@
 #
 
 # Override BQR mask to enable LE Audio Choppy report
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.bqr.event_mask=262238
 else
@@ -60,7 +60,7 @@ PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-service.synabtlinux \
         android.hardware.bluetooth_le.prebuilt.xml
 
 # Bluetooth SAR test tools
-PRODUCT_PACKAGES_DEBUG += bt_sar_test
+PRODUCT_PACKAGES_ENG += bt_sar_test
 
 # Bluetooth Tx power caps
 PRODUCT_COPY_FILES += \
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 2dcc4bc..1bf0e1b 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -211,11 +211,11 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
         libcast_auth
 
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
         test_cast_auth
 
 # USI stylus test tool
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
         usi_test
 
 # Lights HAL