diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index 775627c2a..d6d03a425 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -1,28 +1,35 @@
+- name: Clone wifi if needed
+  systemd:
+    name: clone-wifi
+    state: started
+
 #hostapd_enabled False - set in hostapd.yml to avoid the enable with wifi_up_down False
 #no_net_restart: True - main.yml discovered_wireless_iface == iiab_wan_iface
 - name: Restart hostapd when WiFi is present but not when using WiFi as gateway with wifi_up_down False
   systemd:
     name: hostapd
     state: restarted
-  when: hostapd_enabled and not no_net_restart
+  when: hostapd_enabled and (wifi_up_down or not no_net_restart)
 
 - name: Stop wpa_supplicant on Raspbian
   shell: killall wpa_supplicant
   when: is_raspbian
 
 # now pick up denyinterfaces and respawn wpa_supplicant
-- name: Restart dhcpcd on Raspbian
-  systemd:
-    name: dhcpcd
-    state: restarted
-  when: is_raspbian
-
-- name: Restart clone-wifi wpa_supplicant service
+- name: Restart wpa_supplicant dhcpcd on Raspbian
+  systemd:
+    name: "{{ item }}"
+    state: restarted
+  with_items:
+    - wpa_supplicant
+    - dhcpcd
+  when: is_raspbian
+
+- name: Restart wpa_supplicant service on Ubuntu
   systemd:
     name: "{{ item }}"
     state: restarted
   with_items:
-    - clone-wifi
     - wpa_supplicant
   when: wifi_up_down and hostapd_enabled and is_ubuntu
 
diff --git a/roles/network/tasks/rpi_debian.yml b/roles/network/tasks/rpi_debian.yml
index 12bfef4c4..f9ee65cac 100644
--- a/roles/network/tasks/rpi_debian.yml
+++ b/roles/network/tasks/rpi_debian.yml
@@ -50,13 +50,6 @@
   systemd:
     daemon_reload: yes
 
-- name: Clone wifi if needed
-  systemd:
-    name: clone-wifi
-    state: started
-  when: not no_net_restart
-# might be able to pull off wifi with the staging in restart.yml
-
 - name: Restart the networking service if appropriate
   systemd:
     name: networking