diff --git a/config/common.mk b/config/common.mk
index dde1051cf58353ea7ea9a92a13681cc60df5af70..f25515fb0d6e140f208bf6807714ef8456d2c564 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -23,16 +23,6 @@ ifneq ($(TARGET_SUPPORTS_32_BIT_APPS),false)
 include $(call inherit-product, external/svox/svox_tts.mk)
 endif
 
-# CustomLocale
-ifeq (test,$(RELEASE_TYPE))
-PRODUCT_PACKAGES += \
-    CustomLocale
-endif
-
-# Launcher
-PRODUCT_PACKAGES += \
-    BlissLauncher3
-
 # Overlays
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += $(VENDOR_PATH)/overlay/no-rro
 
diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index 892a5f9c46ead3361e125fe702b91ada8236bd35..47c491fe40f09c9afa76714d19c7222b9cda8d02 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -1,3 +1,18 @@
+# BlissLauncher
+ifeq ($(PRODUCT_TYPE), go)
+PRODUCT_PACKAGES += \
+    BlissLauncher3Go
+
+PRODUCT_DEXPREOPT_SPEED_APPS += \
+    BlissLauncher3Go
+else
+PRODUCT_PACKAGES += \
+    BlissLauncher3
+
+PRODUCT_DEXPREOPT_SPEED_APPS += \
+    BlissLauncher3
+endif
+
 # Default notification/alarm sounds
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.config.notification_sound=Selenium.ogg \