diff --git a/device.mk b/device.mk
index df3769d..d19cbb2 100644
--- a/device.mk
+++ b/device.mk
@@ -1085,6 +1085,14 @@ PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true
 include device/google/gs-common/edgetpu/edgetpu.mk
 # Config variables for TPU chip on device.
 $(call soong_config_set,edgetpu_config,chip,rio_pro)
+# Include the edgetpu targets defined the namespaces below into the final image.
+PRODUCT_SOONG_NAMESPACES += \
+	vendor/google_devices/zumapro/proprietary/gchips/tpu/metrics \
+	vendor/google_devices/zumapro/proprietary/gchips/tpu/tflite_delegate \
+	vendor/google_devices/zumapro/proprietary/gchips/tpu/darwinn_logging_service \
+	vendor/google_devices/zumapro/proprietary/gchips/tpu/nnapi_stable_aidl \
+	vendor/google_devices/zumapro/proprietary/gchips/tpu/aidl \
+	vendor/google_devices/zumapro/proprietary/gchips/tpu/hal
 # TPU firmware
 PRODUCT_PACKAGES += edgetpu-rio.fw