diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
index 7ca22d7a..ed819089 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
@@ -34,6 +34,7 @@ if platform.match('ar71xx', 'generic', {
 	'cpe510',
 	'wbs210',
 	'wbs510',
+	'airgateway',
 	'nanostation-m',
 	'nanostation-m-xw',
 	'unifi-outdoor-plus',
diff --git a/package/gluon-setup-mode/luasrc/lib/gluon/upgrade/320-setup-ifname b/package/gluon-setup-mode/luasrc/lib/gluon/upgrade/320-setup-ifname
index 822aaedc..7f0ca7b8 100755
--- a/package/gluon-setup-mode/luasrc/lib/gluon/upgrade/320-setup-ifname
+++ b/package/gluon-setup-mode/luasrc/lib/gluon/upgrade/320-setup-ifname
@@ -5,16 +5,24 @@ local sysconfig = require 'gluon.sysconfig'
 
 
 if sysconfig.setup_ifname then
-  os.exit(0)
+	os.exit(0)
 end
 
-if
-  platform.match('ar71xx', 'generic', {'cpe210', 'cpe510', 'wbs210', 'wbs510', 'nanostation-m', 'nanostation-m-xw', 'unifi-outdoor-plus', 'uap-pro', 'unifiac-pro'}) or
-  platform.match('ar71xx', 'mikrotik')
-then
-  sysconfig.setup_ifname = sysconfig.config_ifname or sysconfig.wan_ifname or sysconfig.lan_ifname
+if platform.match('ar71xx', 'generic', {
+	'cpe210',
+	'cpe510',
+	'wbs210',
+	'wbs510',
+	'airgateway',
+	'nanostation-m',
+	'nanostation-m-xw',
+	'unifi-outdoor-plus',
+	'uap-pro',
+	'unifiac-pro'
+}) or platform.match('ar71xx', 'mikrotik') then
+	sysconfig.setup_ifname = sysconfig.config_ifname or sysconfig.wan_ifname or sysconfig.lan_ifname
 else
-  sysconfig.setup_ifname = sysconfig.config_ifname or sysconfig.lan_ifname or sysconfig.wan_ifname
+	sysconfig.setup_ifname = sysconfig.config_ifname or sysconfig.lan_ifname or sysconfig.wan_ifname
 end
 
 -- Remove the old sysconfig setting