diff --git a/playbooks/base/post-logs.yaml b/playbooks/base/post-logs.yaml
new file mode 100644
index 0000000..23cf1c6
--- /dev/null
+++ b/playbooks/base/post-logs.yaml
@@ -0,0 +1,9 @@
+- hosts: localhost
+  gather_facts: False
+  roles:
+    - generate-zuul-manifest
+    - role: upload-logs-s3
+      zuul_log_bucket: "{{s3_config.bucket}}"
+      zuul_log_aws_access_key: "{{s3_config.access_key}}"
+      zuul_log_aws_secret_key: "{{s3_config.secret_key}}"
+      upload_logs_s3_endpoint: "{{s3_config.endpoint}}"
diff --git a/playbooks/base/post-ssh.yaml b/playbooks/base/post-ssh.yaml
new file mode 100644
index 0000000..d793838
--- /dev/null
+++ b/playbooks/base/post-ssh.yaml
@@ -0,0 +1,3 @@
+- hosts: all
+  roles:
+    - remove-build-sshkey
diff --git a/playbooks/base/pre.yaml b/playbooks/base/pre.yaml
new file mode 100644
index 0000000..a5a3f4f
--- /dev/null
+++ b/playbooks/base/pre.yaml
@@ -0,0 +1,4 @@
+- hosts: all
+  roles:
+    - add-build-sshkey
+    - prepare-workspace