diff --git a/device.mk b/device.mk
index 032bfb3f..a550e95f 100644
--- a/device.mk
+++ b/device.mk
@@ -559,9 +559,6 @@ ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
 include hardware/google/pixel/dauntless/dauntless.mk
 endif
 
-PRODUCT_PACKAGES_DEBUG += \
-	WvInstallKeybox
-
 # Copy Camera HFD Setfiles
 #PRODUCT_COPY_FILES += \
 	device/google/gs101/firmware/camera/libhfd/default_configuration.hfd.cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/default_configuration.hfd.cfg.json \
diff --git a/factory_common.mk b/factory_common.mk
index 089d9a17..342ae460 100644
--- a/factory_common.mk
+++ b/factory_common.mk
@@ -75,3 +75,7 @@ PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
 # PixelLogger for RF testing
 PRODUCT_PACKAGES_DEBUG += \
     PixelLogger
+
+# Tool for installing Widevine keybox
+PRODUCT_PACKAGES_DEBUG += \
+    WvInstallKeybox