diff --git a/playbooks/base-minimal/post-ssh.yaml b/playbooks/base-minimal/post-ssh.yaml
deleted file mode 100644
index d793838ce6..0000000000
--- a/playbooks/base-minimal/post-ssh.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- hosts: all
-  roles:
-    - remove-build-sshkey
diff --git a/playbooks/base-minimal/post.yaml b/playbooks/base-minimal/post.yaml
new file mode 100644
index 0000000000..0318870c31
--- /dev/null
+++ b/playbooks/base-minimal/post.yaml
@@ -0,0 +1,10 @@
+- hosts: all
+  roles:
+    - fetch-output
+
+- hosts: all
+  # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail
+  # successful jobs.
+  ignore_errors: yes
+  roles:
+    - remove-build-sshkey