diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index e55de3d8..771cc9c0 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -1,14 +1,6 @@
 # Inherit mobile full common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mobile_full.mk)
 
-# Required packages
-PRODUCT_PACKAGES += \
-    LatinIME
-
-# Include Lineage LatinIME dictionaries
-PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/dictionaries
-
 # Enable support of one-handed mode
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_one_handed_mode?=true
diff --git a/config/common_full_tablet.mk b/config/common_full_tablet.mk
index e2707532..0b46a546 100644
--- a/config/common_full_tablet.mk
+++ b/config/common_full_tablet.mk
@@ -3,14 +3,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
 # Inherit mobile full common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mobile_full.mk)
 
-# Required packages
-PRODUCT_PACKAGES += \
-    LatinIME
-
-# Include Lineage LatinIME dictionaries
-PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/dictionaries
-
 # Settings
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.settings.large_screen_opt.enabled=true
diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk
index 5fe2336b..2bd34146 100644
--- a/config/common_full_tablet_wifionly.mk
+++ b/config/common_full_tablet_wifionly.mk
@@ -3,14 +3,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
 # Inherit mobile full common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mobile_full.mk)
 
-# Required packages
-PRODUCT_PACKAGES += \
-    LatinIME
-
-# Include Lineage LatinIME dictionaries
-PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/dictionaries
-
 # Settings
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.settings.large_screen_opt.enabled=true
diff --git a/config/common_mini_phone.mk b/config/common_mini_phone.mk
index 243bda23..4c79bfa4 100644
--- a/config/common_mini_phone.mk
+++ b/config/common_mini_phone.mk
@@ -1,8 +1,4 @@
 # Inherit mobile mini common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mobile_mini.mk)
 
-# Required packages
-PRODUCT_PACKAGES += \
-    LatinIME
-
 $(call inherit-product, vendor/lineage/config/telephony.mk)
diff --git a/config/common_mini_tablet.mk b/config/common_mini_tablet.mk
index 243bda23..4c79bfa4 100644
--- a/config/common_mini_tablet.mk
+++ b/config/common_mini_tablet.mk
@@ -1,8 +1,4 @@
 # Inherit mobile mini common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mobile_mini.mk)
 
-# Required packages
-PRODUCT_PACKAGES += \
-    LatinIME
-
 $(call inherit-product, vendor/lineage/config/telephony.mk)
diff --git a/config/common_mini_tablet_wifionly.mk b/config/common_mini_tablet_wifionly.mk
index 37014adc..cfbc090c 100644
--- a/config/common_mini_tablet_wifionly.mk
+++ b/config/common_mini_tablet_wifionly.mk
@@ -1,8 +1,4 @@
 # Inherit mobile mini common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mobile_mini.mk)
 
-# Required packages
-PRODUCT_PACKAGES += \
-    LatinIME
-
 $(call inherit-product, vendor/lineage/config/wifionly.mk)
diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index 4e898b4b..d11520ac 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -16,7 +16,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Apps
 PRODUCT_PACKAGES += \
     Backgrounds \
-    Glimpse
+    Glimpse \
+    LatinIME
 
 ifeq ($(PRODUCT_TYPE), go)
 PRODUCT_PACKAGES += \
diff --git a/config/common_mobile_full.mk b/config/common_mobile_full.mk
index f7eecd84..84d800cf 100644
--- a/config/common_mobile_full.mk
+++ b/config/common_mobile_full.mk
@@ -35,3 +35,7 @@ PRODUCT_PACKAGES += \
     fonts_customization.xml \
     FontLatoOverlay \
     FontRubikOverlay
+
+# Include Lineage LatinIME dictionaries
+PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries
+PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/dictionaries