diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk
index 2ee6edaa..10e0897a 100644
--- a/edgetpu/edgetpu.mk
+++ b/edgetpu/edgetpu.mk
@@ -4,25 +4,25 @@
 $(call soong_config_set,edgetpu_config,chip,janeiro)
 
 # TPU logging service
-PRODUCT_PACKAGES += \
-	android.hardware.edgetpu.logging@service-edgetpu-logging
+# PRODUCT_PACKAGES += \
+# 	android.hardware.edgetpu.logging@service-edgetpu-logging
 # TPU firmware
-PRODUCT_PACKAGES += \
-	edgetpu-janeiro.fw
+# PRODUCT_PACKAGES += \
+# 	edgetpu-rio.fw
 # TPU NN AIDL HAL
-PRODUCT_PACKAGES += \
-	android.hardware.neuralnetworks@service-darwinn-aidl
+# PRODUCT_PACKAGES += \
+# 	android.hardware.neuralnetworks@service-darwinn-aidl
 # TPU application service
-PRODUCT_PACKAGES += \
-	vendor.google.edgetpu_app_service@1.0-service
+# PRODUCT_PACKAGES += \
+# 	vendor.google.edgetpu_app_service@1.0-service
 # TPU vendor service
-PRODUCT_PACKAGES += \
-	vendor.google.edgetpu_vendor_service@1.0-service
+# PRODUCT_PACKAGES += \
+# 	vendor.google.edgetpu_vendor_service@1.0-service
 # TPU HAL client library
-PRODUCT_PACKAGES += \
-	libedgetpu_client.google
+# PRODUCT_PACKAGES += \
+# 	libedgetpu_client.google
 # TPU metrics logger library
-PRODUCT_PACKAGES += \
-	libmetrics_logger
+# PRODUCT_PACKAGES += \
+# 	libmetrics_logger
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/edgetpu/
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/zuma-sepolicy/edgetpu/