diff --git a/device-tokay.mk b/device-tokay.mk
index e0299caf..ba120387 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -347,3 +347,8 @@ SUPPORT_RIL_DOMAIN_SELECTION := true
 # Thread HAL
 PRODUCT_PACKAGES += \
    com.google.caimito.hardware.threadnetwork
+
+# ETM
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
diff --git a/tokay/BoardConfig.mk b/tokay/BoardConfig.mk
index d09779b9..7cf14bc7 100644
--- a/tokay/BoardConfig.mk
+++ b/tokay/BoardConfig.mk
@@ -27,3 +27,7 @@ include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/tokay/proprietary/BoardConfigVendor.mk
 include device/google/caimito-sepolicy/tokay-sepolicy.mk
 include device/google/caimito/wifi/BoardConfig-wifi.mk
+
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/6_1/BoardUserdebugModules.mk
+endif