diff --git a/mrtg/handlers/main.yml b/mrtg/handlers/main.yml
index 9527d2d9597e56cafb6b6691d6ca5626246c4c10..c52a85234f79bbc9556c45835cc9b2b0621b871d 100644
--- a/mrtg/handlers/main.yml
+++ b/mrtg/handlers/main.yml
@@ -1,5 +1,4 @@
 ---
-# file: shared-roles/network/mrtg/handlers/main.yml
 
 - name: create tmpfiles
-  shell: systemd-tmpfiles --create
+  command: systemd-tmpfiles --create
diff --git a/mrtg/tasks/main.yml b/mrtg/tasks/main.yml
index 64cffdcfc330c68464932e21c0855f0f3d18c6e7..8a0ee1374ea0c8583bbb2d24bc2728f1e6fd15a7 100644
--- a/mrtg/tasks/main.yml
+++ b/mrtg/tasks/main.yml
@@ -34,7 +34,7 @@
     mode: "u+rwx,g+rxs"
   tags: mrtg
 
-- name: create the config
+- name: create the config  # noqa 301
   # yamllint disable-line rule:line-length
   command: "cfgmaker --output /etc/mrtg.cfg {% for switch in mrtg_switches %} --ifdesc=alias {{switch['community']}}@{{switch['router']}}:::::2 {% endfor %}"
   tags: mrtg
@@ -68,14 +68,14 @@
     - create tmpfiles
   tags: mrtg
 
-- name: create an index HTML page
+- name: create an index HTML page  # noqa 301
   # yamllint disable-line rule:line-length
   command: "indexmaker --output /var/www/mrtg/index.html --title='Traffic of {{domain}}' --columns=3 --pagetop='{% for switch in mrtg_switches %}<a href=\"index-{{switch['router']}}.html\"><b>{{switch['router']}}</b>.{{domain}}</a> {% endfor %} {% if use_weathermap %}<a href=\"weathermap.html\">Weathermap</a>{%endif %}' /etc/mrtg.cfg"
   become: true
   become_user: mrtg
   tags: mrtg
 
-- name: create separate index HTML pages
+- name: create separate index HTML pages  # noqa 301
   # yamllint disable-line rule:line-length
   command: "indexmaker --output /var/www/mrtg/index-{{item['router']}}.html --title {{item['router']}}.{{domain}} --filter name=~{{item['router']}}_[0-9]+ --columns=3 --pagetop='<a href=\"index.html\">back</a>' /etc/mrtg.cfg"
   with_items: "{{mrtg_switches}}"
diff --git a/networkd/tasks/bond.yml b/networkd/tasks/bond.yml
index ed7904ee74cf036a2fc5a14b7c2af0900b046bb6..b929e13d5f2d63e87b19f3d54b65f4c2597162f3 100644
--- a/networkd/tasks/bond.yml
+++ b/networkd/tasks/bond.yml
@@ -60,7 +60,7 @@
     group: root
     mode: '0644'
   with_items: "{{ bond.vlans|default(networkd_bond_vlans) }}"
-  when: item.bridge == True
+  when: item.bridge
   notify:
     - restart networkd
 - name: ensure bridge networks are configured
@@ -71,6 +71,6 @@
     group: root
     mode: '0644'
   with_items: "{{ bond.vlans|default(networkd_bond_vlans) }}"
-  when: item.bridge == True
+  when: item.bridge
   notify:
     - restart networkd
diff --git a/networkd/tasks/main.yml b/networkd/tasks/main.yml
index afaab46f9a54563cc101066f435a5ae1942eb210..dca3fe485be303cd85f33ed13300b7c604cb56bc 100644
--- a/networkd/tasks/main.yml
+++ b/networkd/tasks/main.yml
@@ -29,9 +29,9 @@
 
 - name: delete network config files generated by the bootstrap process
   file:
-    path: "{{item.path}}"
+    path: "{{ item.path }}"
     state: absent
-  loop: "{{bootstrap_network_files.files}}"
+  loop: "{{ bootstrap_network_files.files }}"
   notify:
     - restart networkd
 
diff --git a/networkd/tasks/vlan.yml b/networkd/tasks/vlan.yml
index 9205ba4a3266d1c8a4f76b6a210c1734d9b08f5a..b8f6d15a4bd2a8c3b61ef903cd81ef2a82c13968 100644
--- a/networkd/tasks/vlan.yml
+++ b/networkd/tasks/vlan.yml
@@ -34,7 +34,7 @@
     group: root
     mode: '0644'
   with_items: "{{ vlan.vlans }}"
-  when: item.bridge == True
+  when: item.bridge
   notify:
     - restart networkd
 - name: ensure bridge networks are configured
@@ -45,6 +45,6 @@
     group: root
     mode: '0644'
   with_items: "{{ vlan.vlans }}"
-  when: item.bridge == True
+  when: item.bridge
   notify:
     - restart networkd
diff --git a/radius-client/handlers/main.yml b/radius-client/handlers/main.yml
index e5bc998f1f78bb7c1f7fd6c70a2b8a2ef93a10e3..324e296d0e903960933a77d0f515cdcc68fb4267 100644
--- a/radius-client/handlers/main.yml
+++ b/radius-client/handlers/main.yml
@@ -1,7 +1,8 @@
 ---
 
 - name: reload systemd service files
-  command: systemctl daemon-reload
+  systemd:
+    daemon_reload: true
 
 - name: restart wpasupplicant@eth0
   service: name=wpa_supplicant-wired@eth0 state=restarted