diff --git a/device-lynx.mk b/device-lynx.mk
index d38fa58..408a4f2 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -342,3 +342,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Bluetooth device id
 PRODUCT_PRODUCT_PROPERTIES += \
     bluetooth.device_id.product_id=20491
+
+# 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/lynx/BoardConfig.mk b/lynx/BoardConfig.mk
index b3cd8b8..cebad5f 100644
--- a/lynx/BoardConfig.mk
+++ b/lynx/BoardConfig.mk
@@ -43,3 +43,9 @@ include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk
 include device/google/lynx-sepolicy/lynx-sepolicy.mk
 include device/google/gs201/wifi/qcom/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