diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk
index 9d18764..d781920 100644
--- a/cheetah/BoardConfig.mk
+++ b/cheetah/BoardConfig.mk
@@ -33,3 +33,9 @@ include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/cheetah/proprietary/BoardConfigVendor.mk
 include device/google/pantah-sepolicy/cheetah-sepolicy.mk
 include device/google/pantah/wifi/BoardConfig-wifi.mk
+
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
diff --git a/device-cheetah.mk b/device-cheetah.mk
index f2efb5e..ba27799 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -468,3 +468,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Bluetooth device id
 PRODUCT_PRODUCT_PROPERTIES += \
     bluetooth.device_id.product_id=20490
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif
diff --git a/device-panther.mk b/device-panther.mk
index 1694d2d..b58d280 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -451,3 +451,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Bluetooth device id
 PRODUCT_PRODUCT_PROPERTIES += \
     bluetooth.device_id.product_id=20489
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif
diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk
index 23d00dd..b090758 100644
--- a/panther/BoardConfig.mk
+++ b/panther/BoardConfig.mk
@@ -38,3 +38,9 @@ include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/panther/proprietary/BoardConfigVendor.mk
 include device/google/pantah-sepolicy/panther-sepolicy.mk
 include device/google/pantah/wifi/BoardConfig-wifi.mk
+
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif