diff --git a/device.mk b/device.mk
index 160be635..31b1bd74 100644
--- a/device.mk
+++ b/device.mk
@@ -1061,37 +1061,8 @@ PRODUCT_PACKAGES += \
 include hardware/google/pixel/thermal/device.mk
 PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true
 
-## TPU firmware
-#PRODUCT_PACKAGES += \
-#	edgetpu-abrolhos.fw
-#
-## TPU NN HAL
-#PRODUCT_PACKAGES += \
-#	android.hardware.neuralnetworks@1.3-service-darwinn
-#
-## TPU NN AIDL HAL
-#PRODUCT_PACKAGES += \
-#	android.hardware.neuralnetworks@service-darwinn-aidl
-#
-## TPU logging service
-#PRODUCT_PACKAGES += \
-#	android.hardware.edgetpu.logging@service-edgetpu-logging
-#
-## TPU application service
-#PRODUCT_PACKAGES += \
-#	vendor.google.edgetpu@1.0-service
-#
-## TPU vendor service
-#PRODUCT_PACKAGES += \
-#	vendor.google.edgetpu_vendor_service@1.0-service
-#
-## TPU HAL client library
-#PRODUCT_PACKAGES += \
-#	libedgetpu_client.google
-#
-## TPU metrics logger library
-#PRODUCT_PACKAGES += \
-#	libmetrics_logger
+## TPU packages
+include device/google/gs201/edgetpu/edgetpu.mk
 
 # Connectivity Thermal Power Manager
 PRODUCT_PACKAGES += \
diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk
new file mode 100644
index 00000000..300f91e1
--- /dev/null
+++ b/edgetpu/edgetpu.mk
@@ -0,0 +1,25 @@
+# Edgetpu packages
+
+# TPU logging service
+#PRODUCT_PACKAGES += \
+#	android.hardware.edgetpu.logging@service-edgetpu-logging
+# TPU firmware
+PRODUCT_PACKAGES += \
+	edgetpu-janeiro.fw
+# TPU NN AIDL HAL
+#PRODUCT_PACKAGES += \
+#	android.hardware.neuralnetworks@service-darwinn-aidl
+# TPU application service
+#PRODUCT_PACKAGES += \
+#	vendor.google.edgetpu_app_service@1.0-service
+# TPU vendor service
+#PRODUCT_PACKAGES += \
+#	vendor.google.edgetpu_vendor_service@1.0-service
+# TPU HAL client library
+#PRODUCT_PACKAGES += \
+#	libedgetpu_client.google
+# TPU metrics logger library
+#PRODUCT_PACKAGES += \
+#	libmetrics_logger
+#BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/edgetpu/
+