diff --git a/package/gluon-core/files/lib/gluon/upgrade/core/initial/011-gluon-network b/package/gluon-core/files/lib/gluon/upgrade/core/initial/011-gluon-network
index b335913a..17ca50ee 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/core/initial/011-gluon-network
+++ b/package/gluon-core/files/lib/gluon/upgrade/core/initial/011-gluon-network
@@ -30,6 +30,3 @@ tl-wdr4300) # fix up duplicate mac addresses
 esac
 
 uci_commit network
-
-echo 'net.ipv6.conf.all.accept_ra=0' >> /etc/sysctl.conf
-echo 'net.ipv6.conf.default.accept_ra=0' >> /etc/sysctl.conf
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
index 96a952e4..be9d265e 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/core/invariant/011-network
+++ b/package/gluon-core/files/lib/gluon/upgrade/core/invariant/011-network
@@ -1,7 +1,11 @@
 #!/bin/sh
 
 . /lib/functions.sh
+. /lib/gluon/functions/sysctl.sh
 
 
 uci_set network wan peerdns '0'
 uci_commit network
+
+sysctl_set net.ipv6.conf.all.accept_ra 0
+sysctl_set net.ipv6.conf.default.accept_ra 0
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 6a249e79..42206d00 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,5 +16,3 @@ fi
 uci_set network client type 'bridge'
 uci_set network client proto 'dhcpv6'
 uci_set network client reqprefix 'no'
-
-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 7b89edeb..d48bb684 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
@@ -2,6 +2,7 @@
 
 . /lib/functions.sh
 . /lib/gluon/functions/sysconfig.sh
+. /lib/gluon/functions/sysctl.sh
 
 
 uci_remove batman-adv bat0
@@ -46,3 +47,6 @@ uci_add dhcp dhcp client
 uci_set dhcp client interface 'client'
 uci_set dhcp client ignore '1'
 uci_commit dhcp
+
+
+sysctl_set net.ipv6.conf.br-client.forwarding 0