diff --git a/device.mk b/device.mk
index b4ff16b6..459e301a 100644
--- a/device.mk
+++ b/device.mk
@@ -783,12 +783,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
 	securedpud.slider
 
-# Trusty Metrics Daemon
-PRODUCT_SOONG_NAMESPACES += \
-	vendor/google/trusty/common
-
-PRODUCT_PACKAGES += \
-	trusty_metricsd
+include device/google/gs101/trusty_metricsd/trusty_metricsd.mk
 
 PRODUCT_PACKAGES += \
 	android.hardware.graphics.composer@2.4-impl \
diff --git a/trusty_metricsd/trusty_metricsd.mk b/trusty_metricsd/trusty_metricsd.mk
new file mode 100644
index 00000000..487875be
--- /dev/null
+++ b/trusty_metricsd/trusty_metricsd.mk
@@ -0,0 +1,6 @@
+# Trusty Metrics Daemon
+PRODUCT_SOONG_NAMESPACES += \
+	vendor/google/trusty/common
+
+PRODUCT_PACKAGES += trusty_metricsd
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/trusty_metricsd