diff --git a/roles/bindep/tasks/main.yaml b/roles/bindep/tasks/main.yaml
index 0d7cbffc2..2f7e09557 100644
--- a/roles/bindep/tasks/main.yaml
+++ b/roles/bindep/tasks/main.yaml
@@ -1,16 +1,20 @@
 ---
-- include_tasks: find.yaml
+- name: Include find tasks
+  include_tasks: find.yaml
   when: bindep_file is not defined
 
-- include_tasks: find-bindep.yaml
+- name: Include bindep tasks
+  include_tasks: find-bindep.yaml
   when: bindep_file is defined
 
-- include_tasks: install.yaml
+- name: Include install tasks
+  include_tasks: install.yaml
   when:
     - bindep_file is defined
     - bindep_command is not defined
 
-- include_tasks: packages.yaml
+- name: Include package tasks
+  include_tasks: packages.yaml
   loop: "{{ bindep_file is string | ternary([bindep_file], bindep_file) }}"
   loop_control:
     loop_var: zj_bindep_file
diff --git a/roles/ensure-docker/tasks/docker-distro.yaml b/roles/ensure-docker/tasks/docker-distro.yaml
index 9c35c63cb..4a56f3767 100644
--- a/roles/ensure-docker/tasks/docker-distro.yaml
+++ b/roles/ensure-docker/tasks/docker-distro.yaml
@@ -11,4 +11,5 @@
         - not (use_upstream_docker | bool)
       notify: Assure docker service is running
 
-    - include_tasks: docker-setup.yaml
+    - name: Setup docker
+      include_tasks: docker-setup.yaml
diff --git a/roles/ensure-docker/tasks/docker-upstream.yaml b/roles/ensure-docker/tasks/docker-upstream.yaml
index c2b932ba2..62599b2a8 100644
--- a/roles/ensure-docker/tasks/docker-upstream.yaml
+++ b/roles/ensure-docker/tasks/docker-upstream.yaml
@@ -35,4 +35,5 @@
         state: present
       notify: Restart docker
 
-    - include_tasks: docker-setup.yaml
+    - name: Setup docker
+      include_tasks: docker-setup.yaml
diff --git a/roles/ensure-docker/tasks/main.yaml b/roles/ensure-docker/tasks/main.yaml
index dced53281..0c1024558 100644
--- a/roles/ensure-docker/tasks/main.yaml
+++ b/roles/ensure-docker/tasks/main.yaml
@@ -57,7 +57,8 @@
     - not docker_mirror_base_url
     - use_upstream_docker | bool
 
-- include_tasks: "docker-{{ (use_upstream_docker | bool) | ternary('upstream', 'distro') }}.yaml"
+- name: Include tasks for docker install
+  include_tasks: "docker-{{ (use_upstream_docker | bool) | ternary('upstream', 'distro') }}.yaml"
 
 - name: Install docker-compose
   become: true
diff --git a/roles/fetch-output-openshift/tasks/main.yaml b/roles/fetch-output-openshift/tasks/main.yaml
index 56347ad5a..475b828e8 100644
--- a/roles/fetch-output-openshift/tasks/main.yaml
+++ b/roles/fetch-output-openshift/tasks/main.yaml
@@ -22,7 +22,8 @@
   loop_control:
     loop_var: zj_output_dir
 
-- include_tasks: rsync.yaml
+- name: Include rsync tasks
+  include_tasks: rsync.yaml
   when: zj_pod.1.pod is defined
   loop: "{{ openshift_pods.items()|list }}"
   loop_control:
diff --git a/roles/multi-node-bridge/tasks/main.yaml b/roles/multi-node-bridge/tasks/main.yaml
index 27abc1968..005d19205 100644
--- a/roles/multi-node-bridge/tasks/main.yaml
+++ b/roles/multi-node-bridge/tasks/main.yaml
@@ -1,7 +1,8 @@
 # Note (dmsimard)
 # We explicitely declare a PATH environment variable because '/sbin' is not in
 # PATH when using 'become: yes' on some distributions
-- include_tasks:
+- name: Include common tasks
+  include_tasks:
     file: common.yaml
     apply:
       environment:
@@ -10,14 +11,16 @@
     inventory_hostname in groups['switch'] or
     inventory_hostname in groups['peers']
 
-- include_tasks:
+- name: Include switch tasks
+  include_tasks:
     file: switch.yaml
     apply:
       environment:
         PATH: "{{ ansible_env.PATH }}:/sbin:/usr/sbin"
   when: inventory_hostname in groups['switch']
 
-- include_tasks:
+- name: Include peer tasks
+  include_tasks:
     file: peer.yaml
     apply:
       environment:
diff --git a/roles/prepare-workspace-openshift/tasks/main.yaml b/roles/prepare-workspace-openshift/tasks/main.yaml
index ace3be1c5..508859dff 100644
--- a/roles/prepare-workspace-openshift/tasks/main.yaml
+++ b/roles/prepare-workspace-openshift/tasks/main.yaml
@@ -1,5 +1,6 @@
 ---
-- include_tasks: rsync.yaml
+- name: Include rsync tasks
+  include_tasks: rsync.yaml
   when: zj_pod.1.pod is defined
   loop: "{{ openshift_pods.items()|list }}"
   loop_control:
diff --git a/roles/use-buildset-registry/tasks/main.yaml b/roles/use-buildset-registry/tasks/main.yaml
index bf2bebf36..156faca36 100644
--- a/roles/use-buildset-registry/tasks/main.yaml
+++ b/roles/use-buildset-registry/tasks/main.yaml
@@ -124,11 +124,13 @@
   become_user: "{{ buildset_registry_docker_user }}"
   when: buildset_registry_docker_user is defined
   block:
-    - include_tasks: user-config.yaml
+    - name: Include user config
+      include_tasks: user-config.yaml
 - name: Update docker user config to use buildset registry
   when: buildset_registry_docker_user is not defined
   block:
-    - include_tasks: user-config.yaml
+    - name: Include user config
+      include_tasks: user-config.yaml
 
 - name: Check if cri-o is installed
   stat: