diff --git a/device-common.mk b/device-common.mk
index d71c79dd..d00c9679 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -25,9 +25,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml
 
-# Factory OTA
--include vendor/unbundled_google/packages/FactoryOtaPrebuilt/factoryota.mk
-
 # Set system properties identifying the chipset
 PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Google
 TARGET_VENDOR_PROP += device/google/zuma/vendor.prop
diff --git a/device.mk b/device.mk
index 6eabac17..636c43e3 100644
--- a/device.mk
+++ b/device.mk
@@ -36,6 +36,7 @@ include device/google/gs-common/radio/dump.mk
 include device/google/gs-common/gear/dumpstate/aidl.mk
 include device/google/gs-common/umfw_stat/umfw_stat.mk
 include device/google/gs-common/widevine/widevine.mk
+include device/google/gs-common/sota_app/factoryota.mk
 
 include device/google/zuma/dumpstate/item.mk