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
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
new file mode 100644
index 0000000..22b244e
--- /dev/null
+++ b/zuul.d/jobs.yaml
@@ -0,0 +1,25 @@
+- job:
+    name: base
+    parent: null
+    description: |
+      The recommended base job.
+
+      All jobs ultimately inherit from this.  It runs a pre-playbook
+      which copies all of the job's prepared git repos on to all of
+      the nodes in the nodeset.
+
+      It also sets a default timeout value (which may be overidden).
+    pre-run: playbooks/base/pre.yaml
+    post-run:
+      - playbooks/base/post-ssh.yaml
+      - playbooks/base/post-logs.yaml
+    roles:
+      - zuul: zuul/zuul-jobs
+    timeout: 1800
+    nodeset:
+      nodes:
+        - name: ubuntu-focal
+          label: ubuntu-focal
+    secrets:
+      - name: s3_config
+        secret: s3-secrets
diff --git a/zuul.d/pipelines.yaml b/zuul.d/pipelines.yaml
new file mode 100644
index 0000000..d2e5584
--- /dev/null
+++ b/zuul.d/pipelines.yaml
@@ -0,0 +1,50 @@
+- pipeline:
+  name: check
+  description: |
+    Newly uploaded patchsets enter this pipeline to receive an
+    initial +/-1 Verified vote.
+  manager: independent
+  precedence: low
+    trigger:
+      gerrit:
+        - event: pending-check
+          scheme: 'zuul-check'
+    enqueue:
+      gerrit:
+        comment: False
+        checks-api:
+          scheme: 'zuul-check'
+          state: SCHEDULED
+          message: 'Change has been enqueued in check'
+    start:
+      gerrit:
+        comment: False
+        checks-api:
+          scheme: 'zuul-check'
+          state: RUNNING
+          message: 'Jobs have started running'
+    no-jobs:
+      gerrit:
+        comment: False
+        checks-api:
+          scheme: 'zuul-check'
+          state: NOT_RELEVANT
+          message: 'Project has no jobs configured'
+    success:
+      sql:
+      gerrit:
+        comment: False
+        Verified: 1
+        checks-api:
+          scheme: 'zuul-check'
+          state: SUCCESSFUL
+          message: 'Change passed all voting jobs'
+    failure:
+      sql:
+      gerrit:
+        comment: False
+        Verified: -1
+        checks-api:
+          scheme: 'zuul-check'
+          state: FAILED
+          message: 'Change failed'
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
new file mode 100644
index 0000000..5b3f3b9
--- /dev/null
+++ b/zuul.d/projects.yaml
@@ -0,0 +1,10 @@
+- project:
+    name: ^.*$
+    chack:
+      jobs: []
+
+- project:
+    name: zuul-config
+    check:
+      jobs:
+        - noop
diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml
new file mode 100644
index 0000000..6cd30d2
--- /dev/null
+++ b/zuul.d/secrets.yaml
@@ -0,0 +1,27 @@
+- secret:
+    name: s3_secrets
+    data:
+      bucket: zuul-logs
+      access_key: zuul-logs
+      secret_key: !encrypted/pkcs1-oaep
+        - UY/kqPk7+NtYCXO1xq/R69IauNGaY/AA4FSmKwlX+3PCCTwnOnoy6FIENA+UfjEjd1mEO
+          gA2Wykh2SUkHPnxryYdkeG9gw5TLv9GGXhpBaskJpE+6lSEkWB9V5ad4jHnOJZI30wVw0
+          LsF2SzlN4s6beQEp0jSxSzc9qJNQul/hAPaCGksCLdmKGSeNz79aAY8/6AhZANmavbEdg
+          guTYqvyW7Bl/Tt50NIurbMzgxjHufYArA3BopO2QWRkAQVXdG6dTUMXLDq7kBPDQd3QQg
+          SGicimWutqrpsw2qrfG5xBtGfFAf2gkGSel9eBHNdZbRESw5dSgz4kTwZ5vgJzRw1naog
+          fFXUxz7Uu9Q3NHiJAm7Z+J4Ub6KJNPvTO12vsaXbd7T4yrjrcukUjFurNSMoJs7gCH1wt
+          mAErbsun+EJWe8InC/RY+JFuQBjiTG/UpfI4TgCtitisOcJxcTb/qyy8cj7r9O+B0qzD6
+          7e/FlJxw+34u/dLxePcJ1Rcq2jfrxnLDgkkEr6OvGX3d/YEzwR7iFC6JU29jKqFpJG6iF
+          hpZzZitMb0UHWIOI/dWiS6sUadz0og90pN+S/jOn70UwoQzOg9RbM7lavF6ti0EErmRCT
+          SOrnoKRmNL6odqGT6AiIMVKQND2hLS4N38BWLD4DbukYxsH8Xhs9jGi6zuI7dE=
+      endpoint: !encrypted/pkcs1-oaep
+        - ogx+CqIQ0lLvQfUUH06+9M3OvUEAQ/hTEWWgSCaifRjltJnV7NMRJouGzE/IYzeLOQGNv
+          agnKX5IcfXG861mx2Av61nMeQTaQEnT0ARRmatjskt4sw6GZ+4vHbB0xO66MGN1Ugh3FR
+          9q83fe1J8MOOPz7a/YI52uxnMvslX74J6/xzTFiXCKuzXvGE0OGZ31Q05eDZ1GogPKj0r
+          pGZxubeQRVCxae6sCE3HyjFLio77XacZ4Bwu0LzpY1F4uIX0T5yfb2+kc6oXAgTEZ/IIV
+          emrNulNewQgm+6dotAdfcK3OHKvkUrlb4Y28BFUCOuAF4rBmcCYhoWuE9v1RtY2h5dZ/R
+          uJsvPnubVT8VlaVxGVu3RmjXg4G44KN0Lb2U0ezs/WpXqN2oE3Mpd+xJH3PeeFAp11Ls1
+          xbOsX8E2f8srxsmJkpXHImOCKqqCgS2M7is2D1w1iyWSiqShrIj6fqN2WgxB22sNKz5Du
+          FxAcRMYfaaAZ4tQqa3oyZT1400MjU7UbDja2GfYSAwO7SvHxLiJNKBNv2elHq2n79pgmo
+          6o2kHLsQOs8X8PUHpMMlgcd1sqDIgXnFSZOkiXRr65bDrym+gYRF85hu7v+Q4aZV8W5l7
+          Hx22ZFwJBDOSYe5maKSTusVISWopyP5vEoUeZ/GJPZTvRtlHZTtAUtGbxrT4i4=