diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
index eafadb7124d4fdc41dfe5d362f2cf951e20e3684..0d64d5b44a311934442c23571c8d5a5a72d4d965 100755
--- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
+++ b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
@@ -5,5 +5,5 @@ local uci = require('luci.model.uci').cursor()
 
 
 -- fix up duplicate mac addresses (for mesh-on-WAN)
-uci:set('network', 'wan', 'macaddr', util.get_mac(2))
+uci:set('network', 'wan', 'macaddr', util.get_mac(1))
 uci:save('network')
diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
index 2cc0d9896445d1582ea053b094bbd4e3c9cab8a0..116944f84b38d5e3faf60e5026cc99eab3eb6b76 100755
--- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
+++ b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
@@ -18,7 +18,7 @@ uci:section('network', 'interface', 'mesh_lan', {
   proto   = 'batadv',
   mesh    = 'bat0',
   mesh_no_rebroadcast = '1',
-  macaddr = util.get_mac(3),
+  macaddr = util.get_mac(2),
 })
 
 if uci:get('network', 'mesh_lan', 'auto') == nil then
diff --git a/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd b/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
index 6f2095f2f2bc404ab5b54c335a7a14a4b0bca059..e660db9eb2a832e19c07166045b047ba7e577f15 100755
--- a/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
+++ b/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
@@ -127,7 +127,7 @@ uci:section('network', 'interface', 'mesh_vpn',
 		  proto = 'batadv',
 		  mesh = 'bat0',
 		  mesh_no_rebroadcast = 1,
-		  macaddr = util.get_mac(1),
+		  macaddr = util.get_mac(3),
 	  }
 )