diff --git a/device-komodo.mk b/device-komodo.mk
index 70fe567e..be0f33ff 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -391,3 +391,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # Window Extensions
 $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
+# 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/komodo/BoardConfig.mk b/komodo/BoardConfig.mk
index 7ec39a22..ede93d49 100644
--- a/komodo/BoardConfig.mk
+++ b/komodo/BoardConfig.mk
@@ -27,3 +27,7 @@ include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/komodo/proprietary/BoardConfigVendor.mk
 include device/google/caimito-sepolicy/komodo-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