diff --git a/audio/caiman/audio-tables.mk b/audio/caiman/audio-tables.mk
index 295be07d..1fc6d648 100644
--- a/audio/caiman/audio-tables.mk
+++ b/audio/caiman/audio-tables.mk
@@ -64,8 +64,8 @@ PRODUCT_PACKAGES += \
     compens_spk_r.conf \
     default_mic_compensation.bin
 
-# userdebug and eng specific
-PRODUCT_PACKAGES_DEBUG += \
+# eng specific
+PRODUCT_PACKAGES_ENG += \
     BLUETOOTH.mods \
     HANDSFREE.mods \
     HANDSET.mods \
@@ -75,7 +75,7 @@ PRODUCT_PACKAGES_DEBUG += \
     test_config.ini \
     test_preset.mps
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 # Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
 PRODUCT_COPY_FILES += \
     device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
diff --git a/audio/komodo/audio-tables.mk b/audio/komodo/audio-tables.mk
index 1fd720f2..212c7643 100644
--- a/audio/komodo/audio-tables.mk
+++ b/audio/komodo/audio-tables.mk
@@ -64,8 +64,8 @@ PRODUCT_PACKAGES += \
     compens_spk_r.conf \
     default_mic_compensation.bin
 
-# userdebug and eng specific
-PRODUCT_PACKAGES_DEBUG += \
+# eng specific
+PRODUCT_PACKAGES_ENG += \
     BLUETOOTH.mods \
     HANDSFREE.mods \
     HANDSET.mods \
@@ -75,7 +75,7 @@ PRODUCT_PACKAGES_DEBUG += \
     test_config.ini \
     test_preset.mps
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 # Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
 PRODUCT_COPY_FILES += \
     device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
diff --git a/audio/tokay/audio-tables.mk b/audio/tokay/audio-tables.mk
index 5aadc3e6..42890ddb 100644
--- a/audio/tokay/audio-tables.mk
+++ b/audio/tokay/audio-tables.mk
@@ -64,8 +64,8 @@ PRODUCT_PACKAGES += \
     compens_spk_r.conf \
     default_mic_compensation.bin
 
-# userdebug and eng specific
-PRODUCT_PACKAGES_DEBUG += \
+# eng specific
+PRODUCT_PACKAGES_ENG += \
     BLUETOOTH.mods \
     HANDSFREE.mods \
     HANDSET.mods \
@@ -75,7 +75,7 @@ PRODUCT_PACKAGES_DEBUG += \
     test_config.ini \
     test_preset.mps
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 # Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
 PRODUCT_COPY_FILES += \
     device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
diff --git a/caiman/BoardConfig.mk b/caiman/BoardConfig.mk
index d11d75d1..c90eeea7 100644
--- a/caiman/BoardConfig.mk
+++ b/caiman/BoardConfig.mk
@@ -28,7 +28,7 @@ include device/google/zumapro/BoardConfig-common.mk
 include device/google/caimito/sepolicy/caiman-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 -include device/google/common/etm/6_1/BoardUserdebugModules.mk
 endif
 
diff --git a/device-caiman.mk b/device-caiman.mk
index 76e156ad..e7e7e3b7 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -34,7 +34,7 @@ endif
 
 LOCAL_PATH := device/google/caimito
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
     USE_UWBFIELDTESTQM := true
 endif
 ifeq ($(filter factory_caiman, $(TARGET_PRODUCT)),)
@@ -184,7 +184,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false
 
 # Bluetooth hci_inject test tool
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     hci_inject
 
 # Bluetooth OPUS codec
@@ -192,11 +192,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.opus.enabled=true
 
 # 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
@@ -208,7 +208,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
     bluetooth.hfp.swb.supported=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 \
@@ -419,7 +419,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 SUPPORT_RIL_DOMAIN_SELECTION := true
 
 # 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/device-caimito-common.mk b/device-caimito-common.mk
index 12c9b1a5..03daae93 100644
--- a/device-caimito-common.mk
+++ b/device-caimito-common.mk
@@ -29,7 +29,7 @@ PRODUCT_COPY_FILES += \
 	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json \
 	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \
 	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_prediction_lstm_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_prediction_lstm_model.tflite
-        ifneq (,$(filter $(TARGET_BUILD_VARIANT), userdebug eng))
+        ifneq (,$(filter $(TARGET_BUILD_VARIANT), eng))
             PRODUCT_COPY_FILES += \
             $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_wingboard.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_wingboard.json
         endif
diff --git a/device-komodo.mk b/device-komodo.mk
index 857691fb..db1299fc 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -34,7 +34,7 @@ endif
 
 LOCAL_PATH := device/google/caimito
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
     USE_UWBFIELDTESTQM := true
 endif
 ifeq ($(filter factory_komodo, $(TARGET_PRODUCT)),)
@@ -199,7 +199,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false
 
 # Bluetooth hci_inject test tool
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     hci_inject
 
 # Bluetooth OPUS codec
@@ -207,11 +207,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.opus.enabled=true
 
 # 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
@@ -223,7 +223,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
     bluetooth.hfp.swb.supported=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 \
@@ -427,7 +427,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
 
 # 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/device-tokay.mk b/device-tokay.mk
index ef8aff1a..ddf2ddd9 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -177,7 +177,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false
 
 # Bluetooth hci_inject test tool
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     hci_inject
 
 # Bluetooth OPUS codec
@@ -185,11 +185,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.opus.enabled=true
 
 # 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
@@ -201,7 +201,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
     bluetooth.hfp.swb.supported=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 \
@@ -398,7 +398,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
 
 # 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/fingerprint/ultrasonic_udfps.mk b/fingerprint/ultrasonic_udfps.mk
index a7c332c0..10787a35 100644
--- a/fingerprint/ultrasonic_udfps.mk
+++ b/fingerprint/ultrasonic_udfps.mk
@@ -32,7 +32,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.qfp.enable_setprop=0 \
 	log.tag.QFP=3
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/qcom/fingerprint/QFPCalibration
 
diff --git a/komodo/BoardConfig.mk b/komodo/BoardConfig.mk
index 84a71b6e..9b42dd77 100644
--- a/komodo/BoardConfig.mk
+++ b/komodo/BoardConfig.mk
@@ -28,7 +28,7 @@ include device/google/zumapro/BoardConfig-common.mk
 include device/google/caimito/sepolicy/komodo-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 -include device/google/common/etm/6_1/BoardUserdebugModules.mk
 endif
 
diff --git a/location/caiman/Android.bp b/location/caiman/Android.bp
index eedc1fb8..fec45642 100644
--- a/location/caiman/Android.bp
+++ b/location/caiman/Android.bp
@@ -33,7 +33,7 @@ gnss_prebuilt_etc {
                 src: "user/gps.cfg",
             },
             userdebug: {
-                src: "userdebug/gps.cfg",
+                src: "user/gps.cfg",
             },
             eng: {
                 src: "userdebug/gps.cfg",
diff --git a/location/komodo/Android.bp b/location/komodo/Android.bp
index eedc1fb8..fec45642 100644
--- a/location/komodo/Android.bp
+++ b/location/komodo/Android.bp
@@ -33,7 +33,7 @@ gnss_prebuilt_etc {
                 src: "user/gps.cfg",
             },
             userdebug: {
-                src: "userdebug/gps.cfg",
+                src: "user/gps.cfg",
             },
             eng: {
                 src: "userdebug/gps.cfg",
diff --git a/location/tokay/Android.bp b/location/tokay/Android.bp
index eedc1fb8..fec45642 100644
--- a/location/tokay/Android.bp
+++ b/location/tokay/Android.bp
@@ -33,7 +33,7 @@ gnss_prebuilt_etc {
                 src: "user/gps.cfg",
             },
             userdebug: {
-                src: "userdebug/gps.cfg",
+                src: "user/gps.cfg",
             },
             eng: {
                 src: "userdebug/gps.cfg",
diff --git a/tokay/BoardConfig.mk b/tokay/BoardConfig.mk
index 117a913e..fff6eb73 100644
--- a/tokay/BoardConfig.mk
+++ b/tokay/BoardConfig.mk
@@ -28,7 +28,7 @@ include device/google/zumapro/BoardConfig-common.mk
 include device/google/caimito/sepolicy/tokay-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 -include device/google/common/etm/6_1/BoardUserdebugModules.mk
 endif