diff --git a/config/common.mk b/config/common.mk
index 15902fd..0a5fc13 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -164,6 +164,8 @@
     Apollo \
     CMFileManager \
     LockClock \
+    CMUpdater \
+    CMFota \
     CMAccount
 
 # CM Hardware Abstraction Framework
@@ -217,7 +219,6 @@
 PRODUCT_PACKAGES += \
     procmem \
     procrank \
-    CMUpdater \
     Superuser \
     su
 
@@ -230,9 +231,6 @@
     persist.sys.root_access=1
 else
 
-PRODUCT_PACKAGES += \
-    CMFota
-
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.sys.root_access=0