diff --git a/roles/fetch-output/tasks/main.yaml b/roles/fetch-output/tasks/main.yaml
index 254cccdf7..37ba8f884 100644
--- a/roles/fetch-output/tasks/main.yaml
+++ b/roles/fetch-output/tasks/main.yaml
@@ -14,8 +14,8 @@
     state: directory
   with_items:
     - "{{ log_path }}"
-    - "{{ zuul.executor.work_dir }}/artifacts"
-    - "{{ zuul.executor.work_dir }}/docs"
+    - "{{ zuul.executor.work_root }}/artifacts"
+    - "{{ zuul.executor.work_root }}/docs"
 
 - name: Collect log output
   synchronize:
@@ -26,14 +26,14 @@
 
 - name: Collect artifacts
   synchronize:
-    dest: "{{ zuul.executor.work_dir }}/artifacts/"
+    dest: "{{ zuul.executor.work_root }}/artifacts/"
     mode: pull
     src: "{{ zuul_output_dir }}/artifacts/"
     verify_host: true
 
 - name: Collect docs
   synchronize:
-    dest: "{{ zuul.executor.work_dir }}/docs/"
+    dest: "{{ zuul.executor.work_root }}/docs/"
     mode: pull
     src: "{{ zuul_output_dir }}/docs/"
     verify_host: true