diff --git a/package/gluon-mesh-batman-adv/generate/lib/gluon/upgrade/mesh-batman-adv/initial/020-wireless b/package/gluon-mesh-batman-adv/generate/lib/gluon/upgrade/mesh-batman-adv/invariant/020-wireless
similarity index 94%
rename from package/gluon-mesh-batman-adv/generate/lib/gluon/upgrade/mesh-batman-adv/initial/020-wireless
rename to package/gluon-mesh-batman-adv/generate/lib/gluon/upgrade/mesh-batman-adv/invariant/020-wireless
index dbca73d7..fb9b5321 100755
--- a/package/gluon-mesh-batman-adv/generate/lib/gluon/upgrade/mesh-batman-adv/initial/020-wireless
+++ b/package/gluon-mesh-batman-adv/generate/lib/gluon/upgrade/mesh-batman-adv/invariant/020-wireless
@@ -39,17 +39,20 @@ configure_radio() {
 	uci_set wireless "$radio" htmode "$htmode"
 	uci_set wireless "$radio" country '@regdom@'
 
+	uci_remove wireless "client_${radio}"
 	uci_add wireless 'wifi-iface' "client_${radio}"
 	uci_set wireless "client_${radio}" device "$radio"
 	uci_set wireless "client_${radio}" network 'client'
 	uci_set wireless "client_${radio}" mode 'ap'
 	uci_set wireless "client_${radio}" ssid "$ssid"
 
+	uci_remove network "mesh_${radio}"
 	uci_add network 'interface' "mesh_${radio}"
 	uci_set network "mesh_${radio}" proto 'batadv'
 	uci_set network "mesh_${radio}" mtu '1528'
 	uci_set network "mesh_${radio}" mesh 'bat0'
 
+	uci_remove wireless "mesh_${radio}"
 	uci_add wireless 'wifi-iface' "mesh_${radio}"
 	uci_set wireless "mesh_${radio}" device "$radio"
 	uci_set wireless "mesh_${radio}" network "mesh_${radio}"