diff --git a/roles/ensure-output-dirs/README.rst b/roles/ensure-output-dirs/README.rst
new file mode 100644
index 000000000..18709873b
--- /dev/null
+++ b/roles/ensure-output-dirs/README.rst
@@ -0,0 +1,8 @@
+Ensure output directories are in place
+
+**Role Variables**
+
+.. zuul:rolevar:: zuul_output_dir
+   :default: {{ ansible_user_dir }}/zuul-output
+
+   Base directory for collecting job output.
diff --git a/roles/ensure-output-dirs/defaults/main.yaml b/roles/ensure-output-dirs/defaults/main.yaml
new file mode 100644
index 000000000..3e6da11a9
--- /dev/null
+++ b/roles/ensure-output-dirs/defaults/main.yaml
@@ -0,0 +1 @@
+zuul_output_dir: "{{ ansible_user_dir }}/zuul-output"
diff --git a/roles/ensure-output-dirs/tasks/main.yaml b/roles/ensure-output-dirs/tasks/main.yaml
new file mode 100644
index 000000000..2c2a82193
--- /dev/null
+++ b/roles/ensure-output-dirs/tasks/main.yaml
@@ -0,0 +1,8 @@
+- name: Ensure Zuul Output directories exist
+  file:
+    path: "{{ zuul_output_dir }}/{{ item }}"
+    state: directory
+  with_items:
+    - logs
+    - artifacts
+    - docs