diff --git a/.ansible-lint b/.ansible-lint
index bdcc6bf..78e11f1 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -6,3 +6,4 @@ warn_list:
   - command-instead-of-shell  # Use shell only when shell functionality is required
   - experimental  # all rules tagged as experimental
   - fqcn-builtins  # Use FQCN for builtin actions.
+  - jinja[spacing] # Jinja2 spacing could be improved
diff --git a/ansible/cleanup_state.yml b/ansible/cleanup_state.yml
index b5979be..dd0b1a3 100644
--- a/ansible/cleanup_state.yml
+++ b/ansible/cleanup_state.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: localhost
+- name: Cleanup Tenks state
+  hosts: localhost
   tags:
     - cleanup-state
   tasks:
diff --git a/ansible/deploy.yml b/ansible/deploy.yml
index 965e655..269423f 100644
--- a/ansible/deploy.yml
+++ b/ansible/deploy.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: all
+- name: Deploy Tenks
+  hosts: all
   tags:
     - always
   tasks:
diff --git a/ansible/flavor_registration.yml b/ansible/flavor_registration.yml
index 84613d3..69094d1 100644
--- a/ansible/flavor_registration.yml
+++ b/ansible/flavor_registration.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: localhost
+- name: Register Nova flavors
+  hosts: localhost
   tags:
     - flavor-registration
   tasks:
diff --git a/ansible/host_setup.yml b/ansible/host_setup.yml
index 117d2d9..a294815 100644
--- a/ansible/host_setup.yml
+++ b/ansible/host_setup.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: localhost
+- name: Load current Tenks state
+  hosts: localhost
   tags:
     - host-setup
   tasks:
@@ -8,7 +9,8 @@
         file: "{{ state_file_path }}"
         name: tenks_state
 
-- hosts: hypervisors
+- name: Run hypervisor setup
+  hosts: hypervisors
   tags:
     - host-setup
   vars:
@@ -17,7 +19,8 @@
   tasks:
     - include_tasks: hypervisor_setup.yml
 
-- hosts: libvirt
+- name: Set up libvirt and vbmc
+  hosts: libvirt
   tags:
     - host-setup
   tasks:
diff --git a/ansible/node_bmc.yml b/ansible/node_bmc.yml
index a5abede..f9a4208 100644
--- a/ansible/node_bmc.yml
+++ b/ansible/node_bmc.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: localhost
+- name: Load current Tenks state
+  hosts: localhost
   tags:
     - node-bmc
   tasks:
diff --git a/ansible/node_enrolment.yml b/ansible/node_enrolment.yml
index b95300c..0955228 100644
--- a/ansible/node_enrolment.yml
+++ b/ansible/node_enrolment.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: localhost
+- name: Enroll nodes in Ironic
+  hosts: localhost
   tags:
     - node-enrolment
     - node-enrollment
diff --git a/ansible/node_instantiation.yml b/ansible/node_instantiation.yml
index 513b95a..f40de0e 100644
--- a/ansible/node_instantiation.yml
+++ b/ansible/node_instantiation.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: localhost
+- name: Load current Tenks state
+  hosts: localhost
   tags:
     - node-instantiation
   tasks:
@@ -8,7 +9,8 @@
         file: "{{ state_file_path }}"
         name: tenks_state
 
-- hosts: libvirt
+- name: Instantiate libvirt VMs
+  hosts: libvirt
   tags:
     - node-instantiation
   vars:
diff --git a/ansible/node_networking.yml b/ansible/node_networking.yml
index ecc2045..956566d 100644
--- a/ansible/node_networking.yml
+++ b/ansible/node_networking.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: localhost
+- name: Load current Tenks state
+  hosts: localhost
   tags:
     - node-networking
   tasks:
@@ -8,7 +9,8 @@
         file: "{{ state_file_path }}"
         name: tenks_state
 
-- hosts: hypervisors
+- name: Configure hypervisor networking
+  hosts: hypervisors
   tags:
     - node-networking
   vars:
diff --git a/ansible/resource_wait.yml b/ansible/resource_wait.yml
index 87573d2..1e78e8e 100644
--- a/ansible/resource_wait.yml
+++ b/ansible/resource_wait.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: localhost
+- name: Wait for resources
+  hosts: localhost
   tags:
     - resource-wait
   tasks:
diff --git a/ansible/schedule.yml b/ansible/schedule.yml
index 91e9e31..43ea265 100644
--- a/ansible/schedule.yml
+++ b/ansible/schedule.yml
@@ -1,11 +1,12 @@
 ---
-# Ensure we have facts about all hypervisors before scheduling begins.
-- hosts: hypervisors
+- name: Ensure we have facts about all hypervisors before scheduling begins.
+  hosts: hypervisors
   tags:
     - schedule
   gather_facts: true
 
-- hosts: localhost
+- name: Update Tenks state
+  hosts: localhost
   tags:
     - schedule
   tasks:
diff --git a/ansible/teardown.yml b/ansible/teardown.yml
index bd314fb..7b27b2b 100644
--- a/ansible/teardown.yml
+++ b/ansible/teardown.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: all
+- name: Teardown Tenks resources
+  hosts: all
   tags:
     - always
   tasks: