diff --git a/roles/fetch-sphinx-output/README.rst b/roles/fetch-sphinx-output/README.rst
index d73ee3f2f..6f658691e 100644
--- a/roles/fetch-sphinx-output/README.rst
+++ b/roles/fetch-sphinx-output/README.rst
@@ -11,9 +11,19 @@ to the log root of the executor.
    The destination directory on the executor.  By default, the log
    root.
 
+.. zuul:rolevar:: sphinx_build_dir
+   :default: doc/build
+
+   Directory relative to zuul_work_dir where build output will be put.
+
 .. zuul:rolevar:: sphinx_output_src
-   :default: src/{{ zuul.project.canonical_name }}/doc/build/html
+   :default: {{ zuul_work_dir }}/{{ sphinx_build_dir }}/html
 
    The location on the worker from which to fetch the generated sphinx
    content.  By default, the HTML doc build dir of the current
    project.
+
+.. zuul:rolevar:: zuul_work_dir
+   :default: {{ zuul.project.src_dir }}
+
+   The location of the main working directory of the job.
diff --git a/roles/fetch-sphinx-output/defaults/main.yaml b/roles/fetch-sphinx-output/defaults/main.yaml
index b900d6ccb..ca077c601 100644
--- a/roles/fetch-sphinx-output/defaults/main.yaml
+++ b/roles/fetch-sphinx-output/defaults/main.yaml
@@ -1,3 +1,5 @@
 ---
 zuul_executor_dest: "{{ zuul.executor.log_root }}"
-sphinx_output_src: "src/{{ zuul.project.canonical_name }}/doc/build/html"
+zuul_work_dir: "{{ zuul.project.src_dir }}"
+sphinx_build_dir: doc/build
+sphinx_output_src: "{{ zuul_work_dir }}/{{ sphinx_build_dir }}/html"