diff --git a/akita/BoardConfig.mk b/akita/BoardConfig.mk
index 3f50fb1..1598905 100644
--- a/akita/BoardConfig.mk
+++ b/akita/BoardConfig.mk
@@ -44,3 +44,7 @@ include device/google/zuma/BoardConfig-common.mk
 -include vendor/google_devices/akita/proprietary/BoardConfigVendor.mk
 include device/google/akita-sepolicy/akita-sepolicy.mk
 include device/google/akita/wifi/BoardConfig-wifi.mk
+
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/5_15/BoardUserdebugModules.mk
+endif
diff --git a/device-akita.mk b/device-akita.mk
index f957e42..602a327 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -412,3 +412,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
 # Disable Settings large-screen optimization enabled by Window Extensions
 PRODUCT_SYSTEM_PROPERTIES += \
     persist.settings.large_screen_opt.enabled=false
+
+# ETM
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif