diff --git a/akita/BoardConfig.mk b/akita/BoardConfig.mk
index a8bed37..b09fceb 100644
--- a/akita/BoardConfig.mk
+++ b/akita/BoardConfig.mk
@@ -43,7 +43,7 @@ include device/google/zuma/BoardConfig-common.mk
 include device/google/akita/sepolicy/akita-sepolicy.mk
 include device/google/akita/wifi/BoardConfig-wifi.mk
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 -include device/google/common/etm/5_15/BoardUserdebugModules.mk
 endif
 
diff --git a/audio/akita/audio-tables.mk b/audio/akita/audio-tables.mk
index 65242e8..e50e01b 100644
--- a/audio/akita/audio-tables.mk
+++ b/audio/akita/audio-tables.mk
@@ -55,7 +55,7 @@ PRODUCT_COPY_FILES += \
     device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
 
 # userdebug specific
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_COPY_FILES += \
     device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
     device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \
diff --git a/device-akita.mk b/device-akita.mk
index df24564..439394b 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -174,15 +174,15 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.se_capability=1
 
 # Bluetooth hci_inject test tool
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     hci_inject
 
 # Bluetooth SAR test tool
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     sar_test
 
 # Bluetooth EWP test tool
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     ewp_tool
 
 # Bluetooth AAC VBR
@@ -246,7 +246,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_one_handed_mode=true
 
 # Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.bqr.event_mask=295006 \
     persist.bluetooth.bqr.vnd_quality_mask=29 \
@@ -357,7 +357,7 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.auto_exposure_compensation_supported=true
 
 # Fingerprint Auth Filter
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.auth_filter.log_all_coverages=true \
     persist.vendor.udfps.auth_filter.data_collection_enabled=false
@@ -408,6 +408,6 @@ PRODUCT_SYSTEM_PROPERTIES += \
     persist.settings.large_screen_opt.enabled=false
 
 # ETM
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
 endif
diff --git a/location/gnssd/gnss_release.mk b/location/gnssd/gnss_release.mk
index 0edd66e..286a367 100644
--- a/location/gnssd/gnss_release.mk
+++ b/location/gnssd/gnss_release.mk
@@ -15,7 +15,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_SOONG_NAMESPACES += \
     device/google/akita/location/gnssd
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
     PRODUCT_COPY_FILES += \
         device/google/akita/location/gnssd/release/gps.cfg:vendor/etc/gnss/gps.cfg
     PRODUCT_VENDOR_PROPERTIES += \