diff --git a/package/gluon-core/files/lib/gluon/upgrade/core/invariant/011-network b/package/gluon-core/files/lib/gluon/upgrade/core/invariant/011-network
new file mode 100755
index 00000000..96a952e4
--- /dev/null
+++ b/package/gluon-core/files/lib/gluon/upgrade/core/invariant/011-network
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+
+uci_set network wan peerdns '0'
+uci_commit network
diff --git a/package/gluon-mesh-batman-adv/files/lib/gluon/upgrade/mesh-batman-adv/initial/010-mesh b/package/gluon-mesh-batman-adv/files/lib/gluon/upgrade/mesh-batman-adv/initial/010-mesh
index 12aea75e..6a249e79 100755
--- a/package/gluon-mesh-batman-adv/files/lib/gluon/upgrade/mesh-batman-adv/initial/010-mesh
+++ b/package/gluon-mesh-batman-adv/files/lib/gluon/upgrade/mesh-batman-adv/initial/010-mesh
@@ -16,7 +16,5 @@ fi
 uci_set network client type 'bridge'
 uci_set network client proto 'dhcpv6'
 uci_set network client reqprefix 'no'
-uci_set network client peerdns '0'
-uci_set network client macaddr "$(sysconfig primary_mac)"
 
 echo 'net.ipv6.conf.br-client.forwarding=0' >> /etc/sysctl.conf
diff --git a/package/gluon-mesh-batman-adv/files/lib/gluon/upgrade/mesh-batman-adv/invariant/011-mesh b/package/gluon-mesh-batman-adv/files/lib/gluon/upgrade/mesh-batman-adv/invariant/011-mesh
index 755a9c57..7b89edeb 100755
--- a/package/gluon-mesh-batman-adv/files/lib/gluon/upgrade/mesh-batman-adv/invariant/011-mesh
+++ b/package/gluon-mesh-batman-adv/files/lib/gluon/upgrade/mesh-batman-adv/invariant/011-mesh
@@ -10,6 +10,9 @@ uci_set batman-adv bat0 orig_interval '5000'
 uci_set batman-adv bat0 gw_mode 'client'
 uci_commit batman-adv
 
+uci_set network client macaddr "$(sysconfig primary_mac)"
+uci_set network client peerdns '1'
+
 uci_remove network bat0
 uci_add network interface bat0
 uci_set network bat0 ifname 'bat0'