diff --git a/roles/collect-logs/tasks/create-docs.yml b/roles/collect-logs/tasks/create-docs.yml
index 9d7043bdf..04327c897 100644
--- a/roles/collect-logs/tasks/create-docs.yml
+++ b/roles/collect-logs/tasks/create-docs.yml
@@ -6,7 +6,7 @@
 
 - name: Unarchive shell scripts
   shell: >
-    gunzip "{{ artcl_collect_dir }}/undercloud/home/stack/{{ item }}.sh.gz";
+    gunzip "{{ artcl_collect_dir }}/undercloud/home/{{ ansible_user }}/{{ item }}.sh.gz";
   with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}"
   ignore_errors: yes
   when:  artcl_gzip_only|bool
@@ -14,7 +14,7 @@
 - name: Generate rST docs from scripts and move to Sphinx src dir
   shell: >
      awk -f "{{ local_working_dir }}/usr/local/share/ansible/roles/collect-logs/scripts/doc_extrapolation.awk" \
-       "{{ artcl_collect_dir }}/undercloud/home/stack/{{ item }}.sh" > \
+       "{{ artcl_collect_dir }}/undercloud/home/{{ ansible_user }}/{{ item }}.sh" > \
        "{{ artcl_docs_source_dir }}/{{ item }}.rst"
   with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}"
   ignore_errors: yes