diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index 6a60ec235..95e22e430 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -5,45 +5,45 @@
   when: iiab_wireless_lan_iface is defined and hostapd_enabled and iiab_network_mode != "Appliance"
 
 - name: Start named service
-  service:
+  systemd:
     name: "{{ dns_service }}"
     state: restarted
   when: named_enabled and named_install
 
 - name: Stop Squid service
-  service:
+  systemd:
     name: "{{ proxy }}"
     state: stopped
   async: 120
   when: squid_install
 
 - name: Stop DansGuardian
-  service:
+  systemd:
     name: dansguardian
     state: stopped
   when: dansguardian_install
 
-- name: Restart DansGuardian - except Ubuntu which needs reboot to activate
-  service:
+- name: Restart DansGuardian service (dansguardian) except Ubuntu which needs reboot to activate
+  systemd:
     name: dansguardian
     state: restarted
   when: dansguardian_enabled and dansguardian_install and ( not is_ubuntu and iiab_stage|int < 4 )
 
 # Squid get re-loaded with dispatcher.d
-- name: Restart Squid service
-  service:
+- name: Restart Squid service ({{ proxy }})
+  systemd:
     name: "{{ proxy }}"
     state: restarted
   when: squid_enabled and squid_install
 
-- name: Restart Wondershaper service
-  service:
+- name: Restart Wondershaper service (wondershaper)
+  systemd:
     name: wondershaper
     state: restarted
   when: wondershaper_enabled
 
-- name: Restart avahi service
-  service:
+- name: Restart Avahi service (avahi-daemon)
+  systemd:
     name: avahi-daemon
     state: restarted
 
@@ -56,7 +56,7 @@
 - name: Waiting {{ hostapd_wait }} seconds for network to stabilize
   shell: sleep {{ hostapd_wait }}
 
-- name: Run iptables
+- name: Run /usr/bin/iiab-gen-iptables
   command: /usr/bin/iiab-gen-iptables
 
 - name: Checking if WiFi slave is active
@@ -71,7 +71,7 @@
   when: hostapd_enabled and wifi_slave.stdout is defined and wifi_slave.stdout == 0
 
 - name: dhcp_server may be affected - starting - user choice
-  service:
+  systemd:
     name: "{{ dhcp_service2 }}"
     state: restarted
   when: iiab_network_mode != "Appliance"