diff --git a/.zuul.yaml b/.zuul.yaml
index 11a08e11a6..471160f214 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -22,6 +22,66 @@
     vars:
       project_src_dir: "{{ zuul.project.src_dir }}/modules/openstack_project"
 
+# Image building jobs
+- secret:
+    name: system-config-dockerhub
+    data:
+      username: openstackzuul
+      password: !encrypted/pkcs1-oaep
+        - iz3aVtc1eXwM/d02gaA8qyvryJtrOOTmPZhfWiRw3VaVpuU/lrpSD/qRKPwBEbhFCpzCh
+          B3eelTaJMKaMsVFU/cD+EOB6MBpCtHreKug3+B1g1Ag9TQaLGfa2d7swPRrhFEENpQBzm
+          D9OqBYVCWTyGo/Y1nkC/zb+e1H2IdI1axNJrVaKR6FYN8vhpPsflvyW2PCNsdT2YlKCMz
+          G0wFMJv6zMH6Jw1c0ruHm5pa9O4EWLwhmdxHMeTRAT4JVJdLehVGQLBXvXxZzMOXB2Jrj
+          KHIMFFhzlc1bZXcFKAMakvfP0ARLmPySEnIcVHjHXvsXmGLuVB0lSXUtUB1QW8qJcso1m
+          C0ky4VAFHoNB/EV5VGu7btkZDtJKzsQcPXnaT1LcX1xS+QC0bC4SYR25WN9RK7z1sXvMn
+          dxMIwJIvXOb+aE5mdl63G8OBTxznPAGioCZNjqoMPQJ7VzITSYnPiW5CyZDUinTSDDver
+          zHBG/Svpwiu7Lm2vOgExHYdCDeo0a5lacxjcwW2FfP7fal3ZLoTeSTGXvIaffS552mZ9L
+          I0cLfq/ikkbaC4a+bqFnVdDm9wNAyBtOkq5wn3TqOFMrFaBlkI5/34i2fLauZOoka6bcN
+          zJnvDrjRemvgmWP1q4uI8cPzJK3zjN9/GYrs1MQxHCsNn33sWpc1oHRO+TL/8g=
+
+- job:
+    name: system-config-build-image
+    description: |
+      Build a docker image.
+
+      See the `role documentation
+      <https://zuul-ci.org/docs/zuul-jobs/roles.html#role-build-docker-image>`_
+      for details.
+    abstract: true
+    pre-run: playbooks/zuul/build-image/pre.yaml
+    run: playbooks/zuul/build-image/run.yaml
+
+- job:
+    name: system-config-upload-image
+    parent: system-config-build-image
+    description: |
+      Build and upload a docker image.
+
+      See the `role documentation
+      <https://zuul-ci.org/docs/zuul-jobs/roles.html#role-upload-docker-image>`_
+      for details.
+    abstract: true
+    post-run: playbooks/zuul/build-image/upload.yaml
+    secrets:
+      name: credentials
+      secret: system-config-dockerhub
+
+- job:
+    name: system-config-promote-image
+    description: |
+      Retag a previously-uploaded docker image.
+
+      See the `role documentation
+      <https://zuul-ci.org/docs/zuul-jobs/roles.html#role-promote-docker-image>`_
+      for details.
+    abstract: true
+    run: playbooks/zuul/build-image/promote.yaml
+    secrets:
+      name: credentials
+      secret: system-config-dockerhub
+    nodeset:
+      nodes: []
+
 # Role integration jobs.  These test the top-level generic roles/*
 # under Zuul.  The range of platforms should be the same as those for
 # openstack-zuul-jobs.
diff --git a/playbooks/zuul/build-image/pre.yaml b/playbooks/zuul/build-image/pre.yaml
new file mode 100644
index 0000000000..52f5b5b268
--- /dev/null
+++ b/playbooks/zuul/build-image/pre.yaml
@@ -0,0 +1,3 @@
+- hosts: all
+  roles:
+    - install-docker
diff --git a/playbooks/zuul/build-image/promote.yaml b/playbooks/zuul/build-image/promote.yaml
new file mode 100644
index 0000000000..8160bf438f
--- /dev/null
+++ b/playbooks/zuul/build-image/promote.yaml
@@ -0,0 +1,3 @@
+- hosts: localhost
+  roles:
+    - promote-docker-image
diff --git a/playbooks/zuul/build-image/run.yaml b/playbooks/zuul/build-image/run.yaml
new file mode 100644
index 0000000000..d3525ad850
--- /dev/null
+++ b/playbooks/zuul/build-image/run.yaml
@@ -0,0 +1,3 @@
+- hosts: all
+  roles:
+    - build-docker-image
diff --git a/playbooks/zuul/build-image/upload.yaml b/playbooks/zuul/build-image/upload.yaml
new file mode 100644
index 0000000000..712f7261fb
--- /dev/null
+++ b/playbooks/zuul/build-image/upload.yaml
@@ -0,0 +1,3 @@
+- hosts: all
+  roles:
+    - upload-docker-image