diff --git a/roles/nameserver/tasks/main.yml b/roles/nameserver/tasks/main.yml
index 92c73ce..7d382ac 100644
--- a/roles/nameserver/tasks/main.yml
+++ b/roles/nameserver/tasks/main.yml
@@ -5,34 +5,40 @@
 - block:
   - name: nameserver | unbound | install and configure
     block:
-      - include_tasks: install_unbound.yml
-      - include_tasks: configure_unbound_snmpd.yml
+      - name: nameserver | unbound | install
+        include_tasks: install_unbound.yml
+      - name: nameserver | unbound | configure
+        include_tasks: configure_unbound_snmpd.yml
     when:
       - unbound is defined
-      - unbound == true
-      - powerdns_recursor is not defined or powerdns_recursor == false
+      - unbound is true
+      - powerdns_recursor is not defined or powerdns_recursor is false
 
   - name: nameserver | unbound | disable systemd-resolved
     include_tasks: disable-systemd-resolved.yml
-    when: bind == true or unbound == true or powerdns_recursor == true
+    when: bind is true or unbound is true or powerdns_recursor is true
 
   - name: nameserver | bind | install and configure
     block:
-      - include_tasks: install_bind.yml
-      - include_tasks: configure_bind_snmpd.yml
+      - name: nameserver | bind | install
+        include_tasks: install_bind.yml
+      - name: nameserver | bind | configure
+        include_tasks: configure_bind_snmpd.yml
     when:
       - bind is defined
-      - bind == true
-      - powerdns_auth is not defined or powerdns_auth == false
+      - bind is true
+      - powerdns_auth is not defined or powerdns_auth is false
 
   - name: nameserver | powerdns-recursor | install and configure
     block:
-      - include_tasks: install_powerdns_recursor.yml
-      - include_tasks: configure_powerdns_recursor_snmpd.yml
+      - name: nameserver| powerdns-recursor | install
+        include_tasks: install_powerdns_recursor.yml
+      - name: nameserver | powerdns-recursor | configure
+        include_tasks: configure_powerdns_recursor_snmpd.yml
     when:
       - powerdns_recursor is defined
-      - powerdns_recursor == true
-      - unbound is not defined or unbound == false
+      - powerdns_recursor is true
+      - unbound is not defined or unbound is false
 
   rescue:
     - set_fact: task_failed=true