diff --git a/ansible/host_setup.yml b/ansible/host_setup.yml
index 649ca8d..117d2d9 100644
--- a/ansible/host_setup.yml
+++ b/ansible/host_setup.yml
@@ -21,7 +21,8 @@
   tags:
     - host-setup
   tasks:
-    - block:
+    - name: Set up host
+      block:
         - name: Configure host for Libvirt
           include_role:
             name: stackhpc.libvirt-host
diff --git a/ansible/hypervisor_setup.yml b/ansible/hypervisor_setup.yml
index 9ab891d..ba30ec9 100644
--- a/ansible/hypervisor_setup.yml
+++ b/ansible/hypervisor_setup.yml
@@ -29,7 +29,8 @@
   # Don't remove log directory during teardown to preserve historical logs.
   when: cmd != 'teardown'
 
-- block:
+- name: Check if OVS is installed
+  block:
     - name: Check if ovs-vsctl command is present
       command: ovs-vsctl --version
       register: ovs_vsctl_check
diff --git a/ansible/physical_network.yml b/ansible/physical_network.yml
index c7ce898..bdeb93e 100644
--- a/ansible/physical_network.yml
+++ b/ansible/physical_network.yml
@@ -35,7 +35,8 @@
     source_type: linuxbridge
   when: if_details.stdout_lines[-1].split()[0] == 'bridge'
 
-- block:
+- name: Register source interface as an Open vSwitch bridge
+  block:
     - name: Get list of OVS bridges
       command: ovs-vsctl list-br
       register: ovs_bridges
@@ -58,7 +59,8 @@
   become: true
   when: bridge_type == "openvswitch"
 
-- block:
+- name: Create Tenks bridge
+  block:
     - name: Check if Tenks bridge exists
       stat:
         path: /sys/class/net/{{ tenks_bridge }}
@@ -131,7 +133,7 @@
         state: "{{ state }}"
       become: true
 
-- name: Plug source interface into Tenks bridge
+- name: Plug source interface into Tenks OVS bridge
   openvswitch_port:
     bridge: "{{ tenks_bridge }}"
     port: "{{ source_interface }}"
@@ -144,7 +146,8 @@
     - state != 'absent'
   become: true
 
-- block:
+- name: Plug source interface into Tenks Linux bridge
+  block:
     - name: Speculatively check interface's master
       command: >-
         realpath /sys/class/net/{{ source_interface }}/master
@@ -152,7 +155,7 @@
       failed_when: false
       changed_when: false
 
-    - name: Plug source interface into Tenks bridge
+    - name: Plug source interface into Tenks Linux bridge
       command: >-
         {{ tenks_ip_path }} link set dev {{ source_interface }} master {{ tenks_bridge }}
       changed_when: true
diff --git a/ansible/resource_wait.yml b/ansible/resource_wait.yml
index e7a6f52..87573d2 100644
--- a/ansible/resource_wait.yml
+++ b/ansible/resource_wait.yml
@@ -22,7 +22,8 @@
       loop_control:
         loop_var: spec
 
-    - block:
+    - name: Include the wait-for-resources role
+      block:
         - name: Check that OpenStack credentials exist in the environment
           fail:
             msg: >
diff --git a/ansible/roles/ironic-enrolment/tasks/main.yml b/ansible/roles/ironic-enrolment/tasks/main.yml
index 3b8466d..689dcb1 100644
--- a/ansible/roles/ironic-enrolment/tasks/main.yml
+++ b/ansible/roles/ironic-enrolment/tasks/main.yml
@@ -44,7 +44,8 @@
 # If using clouds.yaml for authentication we need to pass in the ironic_url
 # argument to the os_ironic module, due to a quirk in its implementation.
 # Grab the endpoint from the file.
-- block:
+- name: Set ironic_url for os_ironic module
+  block:
     - name: Query clouds.yaml
       os_client_config:
         clouds: "{{ lookup('env', 'OS_CLOUD') }}"
diff --git a/ansible/roles/veth-pair/tasks/absent.yml b/ansible/roles/veth-pair/tasks/absent.yml
index 3d679fa..d6ef3d1 100644
--- a/ansible/roles/veth-pair/tasks/absent.yml
+++ b/ansible/roles/veth-pair/tasks/absent.yml
@@ -1,16 +1,17 @@
 ---
-- block:
-  - include_tasks: is-attached.yml
-    vars:
-      bridge: "{{ veth_pair_source_bridge }}"
-      interface: "{{ veth_pair_source_link_name }}"
+- name: Unplug veth from source bridge
+  block:
+    - include_tasks: is-attached.yml
+      vars:
+        bridge: "{{ veth_pair_source_bridge }}"
+        interface: "{{ veth_pair_source_link_name }}"
 
-  - name: Unplug veth from source bridge
-    command: >-
-      ip link set {{ veth_pair_source_link_name }} nomaster
-    when:
-      - veth_pair_is_attached
-    become: true
+    - name: Unplug veth from source bridge
+      command: >-
+        ip link set {{ veth_pair_source_link_name }} nomaster
+      when:
+        - veth_pair_is_attached
+      become: true
   when: veth_pair_plug_into_source | bool
 
 - name: Delete veth pair
diff --git a/ansible/roles/veth-pair/tasks/present.yml b/ansible/roles/veth-pair/tasks/present.yml
index 78a7cbd..82d8f40 100644
--- a/ansible/roles/veth-pair/tasks/present.yml
+++ b/ansible/roles/veth-pair/tasks/present.yml
@@ -27,7 +27,8 @@
   when: veth_pair_peer_bridge_type == "openvswitch"
   become: true
 
-- block:
+- name: Plug veth into source bridge
+  block:
     - include_tasks: is-attached.yml
       vars:
         bridge: "{{ veth_pair_peer_bridge }}"
@@ -42,7 +43,8 @@
       become: true
   when: veth_pair_peer_bridge_type == "linuxbridge"
 
-- block:
+- name: Plug veth into source bridge
+  block:
     - include_tasks: is-attached.yml
       vars:
         bridge: "{{ veth_pair_source_bridge }}"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 0ca5118..21170e9 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -9,7 +9,6 @@
       jobs:
         - openstack-tox-pep8
         - openstack-tox-py36
-        - openstack-tox-py37
         - openstack-tox-py38
         - openstack-tox-py39
         - tenks-tox-ansible-lint
@@ -26,7 +25,6 @@
       jobs:
         - openstack-tox-pep8
         - openstack-tox-py36
-        - openstack-tox-py37
         - openstack-tox-py38
         - openstack-tox-py39
         - tenks-tox-ansible-lint