diff --git a/openmptcprouter/files/etc/uci-defaults/1920-omr-network b/openmptcprouter/files/etc/uci-defaults/1920-omr-network
index dbf44daca..c25082b75 100755
--- a/openmptcprouter/files/etc/uci-defaults/1920-omr-network
+++ b/openmptcprouter/files/etc/uci-defaults/1920-omr-network
@@ -33,21 +33,24 @@ if [ "$(uci -q show network | grep wan)" = "" ]; then
 	uci -q batch <<-EOF
 	set network.wan1=interface
 	set network.wan1.ifname=eth0
-	set network.wan1.proto=none
+	set network.wan1.proto=static
 	set network.wan1.type=macvlan
 	set network.wan1.ip4table=wan
 	set network.wan1.multipath=master
 	set network.wan1.defaultroute=0
-	add_list firewall.wan.network=wan1
+	commit network
+	add_list firewall.@zone[1].network=wan1
+	commit firewall
 	set network.wan2=interface
 	set network.wan2.ifname=eth0
-	set network.wan2.proto=none
+	set network.wan2.proto=static
 	set network.wan2.type=macvlan
 	set network.wan2.ip4table=wan
 	set network.wan2.multipath=on
 	set network.wan2.defaultroute=0
-	add_list firewall.wan.network=wan2
 	commit network
+	add_list firewall.@zone[1].network=wan2
+	commit firewall
 	EOF
 	_setup_macvlan wan1
 	_setup_macvlan wan2