diff --git a/config/cdma.mk b/config/cdma.mk
index bd1a699..e69de29 100644
--- a/config/cdma.mk
+++ b/config/cdma.mk
@@ -1,3 +0,0 @@
-# CDMA APN list
-PRODUCT_COPY_FILES += \
-    vendor/cm/prebuilt/common/etc/apns-conf-cdma.xml:system/etc/apns-conf.xml
diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index 1e85f2f..b6fe356 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -14,3 +14,16 @@
     PRODUCT_COPY_FILES += \
         vendor/cm/prebuilt/common/bootanimation/480.zip:system/media/bootanimation.zip
 endif
+
+# World APN list
+PRODUCT_COPY_FILES += \
+    vendor/cm/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
+
+# World SPN overrides list
+PRODUCT_COPY_FILES += \
+    vendor/cm/prebuilt/common/etc/spn-conf.xml:system/etc/spn-conf.xml
+
+# SIM Toolkit
+PRODUCT_PACKAGES += \
+    Stk
+
diff --git a/config/common_mini_phone.mk b/config/common_mini_phone.mk
index ec5e294..60fd1f2 100644
--- a/config/common_mini_phone.mk
+++ b/config/common_mini_phone.mk
@@ -20,3 +20,15 @@
     PRODUCT_COPY_FILES += \
         vendor/cm/prebuilt/common/bootanimation/320.zip:system/media/bootanimation.zip
 endif
+# World APN list
+PRODUCT_COPY_FILES += \
+    vendor/cm/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
+
+# World SPN overrides list
+PRODUCT_COPY_FILES += \
+    vendor/cm/prebuilt/common/etc/spn-conf.xml:system/etc/spn-conf.xml
+
+# SIM Toolkit
+PRODUCT_PACKAGES += \
+    Stk
+
diff --git a/config/gsm.mk b/config/gsm.mk
index 58a8af5..e69de29 100644
--- a/config/gsm.mk
+++ b/config/gsm.mk
@@ -1,12 +0,0 @@
-# GSM APN list
-PRODUCT_COPY_FILES += \
-    vendor/cm/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
-
-# GSM SPN overrides list
-PRODUCT_COPY_FILES += \
-    vendor/cm/prebuilt/common/etc/spn-conf.xml:system/etc/spn-conf.xml
-
-# SIM Toolkit
-PRODUCT_PACKAGES += \
-    Stk
-