diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml
index cf450bb59..7cdf5b37c 100644
--- a/roles/network/defaults/main.yml
+++ b/roles/network/defaults/main.yml
@@ -91,7 +91,6 @@ systemd_networkd_active: False
 # The values here are default local variables
 gui_wan_iface: "unset"
 gui_static_wan_ip: "unset"
-gui_desired_network_role: Gateway
 wondershaper_dspeed: "4096"
 wondershaper_upspeed: "1024"
 
diff --git a/roles/network/tasks/down-debian.yml b/roles/network/tasks/down-debian.yml
index fb5589d0f..a0e9008e0 100644
--- a/roles/network/tasks/down-debian.yml
+++ b/roles/network/tasks/down-debian.yml
@@ -6,20 +6,20 @@
 #    src: network/resolvconf.j2
 
 - name: BIND may be affected
-  service:
+  systemd:
     name: "{{ dns_service }}"
     state: stopped
   when: named_install and dnsmasq_enabled
 
 # dhcpd_server release the interface
 - name: dhcpd_server may be affected - stopping dhcpd
-  service:
+  systemd:
     name: dhcpd
     state: stopped
   when: dhcpd_install | bool
 
 - name: dhcpd_server may be affected - stopping dnsmasq
-  service:
+  systemd:
     name: dnsmasq
     state: stopped
-  when: dnsmasq_install | bool
+  when: dnsmasq_install and not no_net_restart
diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index 9618a9960..6c6720d3c 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -74,6 +74,6 @@
   systemd:
     name: "{{ dhcp_service2 }}"
     state: restarted
+  when: not no_net_restart
   #when: (iiab_network_mode != "Appliance")    # Sufficient b/c br0 exists thanks to /etc/network/interfaces.d/iiab
-  #when: (iiab_network_mode != "Appliance") and (not no_net_restart)
   #when: iiab_network_mode != "Appliance" and iiab_wan_iface != discovered_wireless_iface
diff --git a/roles/network/templates/network/rpi.j2 b/roles/network/templates/network/rpi.j2
index e0f21745a..9e3c1b69b 100644
--- a/roles/network/templates/network/rpi.j2
+++ b/roles/network/templates/network/rpi.j2
@@ -1,6 +1,7 @@
 # iiab_network_mode is {{ iiab_network_mode  }}
+{% if gui_desired_network_role is defined %}
 # gui_desired_network_role is {{ gui_desired_network_role }}
-
+{% endif %}
 {% if iiab_network_mode != "Appliance"  %}
 #################   LANCONTROLLER   ###################
 auto br0