diff --git a/ansible/roles/resource-data/tasks/unarchive-nfs-resource.yml b/ansible/roles/resource-data/tasks/unarchive-nfs-resource.yml
index 9f9d92d..bbf9932 100644
--- a/ansible/roles/resource-data/tasks/unarchive-nfs-resource.yml
+++ b/ansible/roles/resource-data/tasks/unarchive-nfs-resource.yml
@@ -16,7 +16,8 @@
         fstype: nfs
         state: mounted
 
-    - name: "Unarchive resource {{ resources_dir }}/{{ resource_source_filename }} to {{ resource_destination_directory }} dir on infrastructure servers over nfs"
+    - name: "Unarchive resource {{ resources_dir }}/{{ resource_source_filename }} \
+             to {{ resource_destination_directory }} dir on infrastructure servers over nfs"
       unarchive:
         src: "/tmp/resource_data/{{ resource_source_filename }}"
         dest: "{{ resource_destination_directory }}"
diff --git a/ansible/roles/resource-data/tasks/unarchive-resource.yml b/ansible/roles/resource-data/tasks/unarchive-resource.yml
index 79fdbfc..9097ddc 100644
--- a/ansible/roles/resource-data/tasks/unarchive-resource.yml
+++ b/ansible/roles/resource-data/tasks/unarchive-resource.yml
@@ -34,7 +34,9 @@
 
     - name: "Unarchive resource {{ resource_source_filename }} from host {{ resources_source_host }}, transport is {{ transport }}"
       include_tasks: "unarchive-{{ transport }}-resource.yml"
-    - file:
+
+    - name: "Generate flag file after resources are deployed on infra"
+      file:
         path: "{{ resource_destination_directory }}/{{ resource_source_filename }}-uploaded"
         state: touch
   rescue:
@@ -51,5 +53,6 @@
       with_items: "{{ files_after_fail.files | difference(original_files.files) }}"
       when: files_after_fail is defined
 
-    - fail:
+    - name: "Report failure of upload operation"
+      fail:
         msg: "Upload of {{ resource_source_filename }} failed"
diff --git a/ansible/roles/resource-data/tasks/unarchive-ssh-resource.yml b/ansible/roles/resource-data/tasks/unarchive-ssh-resource.yml
index 1385ba5..bd578ae 100644
--- a/ansible/roles/resource-data/tasks/unarchive-ssh-resource.yml
+++ b/ansible/roles/resource-data/tasks/unarchive-ssh-resource.yml
@@ -29,7 +29,8 @@
       set_fact:
         tar_extract_options: "{{ '-xzf' if compressed.rc == 0 else '-xf' }}"
 
-    - name: "Unarchive resource {{ resources_dir }}/{{ resource_source_filename }} to {{ resource_destination_directory }} dir on infrastructure servers over ssh"
+    - name: "Unarchive resource {{ resources_dir }}/{{ resource_source_filename }} \
+             to {{ resource_destination_directory }} dir on infrastructure servers over ssh"
       shell: >
         ssh -o StrictHostKeyChecking=no -o BatchMode=yes
         -i /root/.ssh/infra_to_resource.privkey