diff --git a/playbooks/base-test/post-ssh.yaml b/playbooks/base-test/post.yaml
similarity index 53%
rename from playbooks/base-test/post-ssh.yaml
rename to playbooks/base-test/post.yaml
index d793838..a021a08 100644
--- a/playbooks/base-test/post-ssh.yaml
+++ b/playbooks/base-test/post.yaml
@@ -1,3 +1,7 @@
+- hosts: all
+  roles:
+    - fetch-output
+
 - hosts: all
   roles:
     - remove-build-sshkey
diff --git a/playbooks/base/post-ssh.yaml b/playbooks/base/post.yaml
similarity index 53%
rename from playbooks/base/post-ssh.yaml
rename to playbooks/base/post.yaml
index d793838..a021a08 100644
--- a/playbooks/base/post-ssh.yaml
+++ b/playbooks/base/post.yaml
@@ -1,3 +1,7 @@
+- hosts: all
+  roles:
+    - fetch-output
+
 - hosts: all
   roles:
     - remove-build-sshkey
diff --git a/zuul.yaml b/zuul.yaml
index 9aaa6d7..b16f321 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -10,7 +10,7 @@
 
       It also sets a default timeout value (which may be overidden).
     pre-run: playbooks/base/pre.yaml
-    post-run: playbooks/base/post-ssh.yaml
+    post-run: playbooks/base/post.yaml
     roles:
       - zuul: git.zuul-ci.org/zuul-jobs
     timeout: 1800
@@ -22,7 +22,7 @@
       A job to test changes to the base job without disturbing the
       main job in production.  Not for general use.
     pre-run: playbooks/base-test/pre.yaml
-    post-run: playbooks/base-test/post-ssh.yaml
+    post-run: playbooks/base-test/post.yaml
     roles:
       - zuul: git.zuul-ci.org/zuul-jobs
     timeout: 1800