diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index 8ac18e638511409762b9d817c180197029d9b204..d02eaf03bed32f5606c5b9f6fe90048aecd12045 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -78,6 +78,16 @@ ifneq ($(TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_TOGGLE),)
     $(call soong_config_set,lineage_health,charging_control_supports_toggle,$(TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_TOGGLE))
 endif
 
+# MTK APNs
+ifneq ($(TARGET_USES_MTK_APNS_CONF),)
+    # The vendor/apn file selection logic relies on old namespace
+    # Bring back old namespace to keep having single branch for vendor/apn
+    $(call add_soong_config_namespace,lineageGlobalVars)
+    $(call add_soong_config_var,lineageGlobalVars,uses_mtk_apns_conf)
+    # Set our soong config variable into old namespace
+    $(call soong_config_set,lineageGlobalVars,uses_mtk_apns_conf,$(TARGET_USES_MTK_APNS_CONF))
+endif
+
 # Surfaceflinger
 ifneq ($(TARGET_SURFACEFLINGER_UDFPS_LIB),)
     $(warning TARGET_SURFACEFLINGER_UDFPS_LIB is deprecated, please migrate to soong_config_set,surfaceflinger,udfps_lib)