diff --git a/modules/openstack_project/files/jenkins_job_builder/config/ironic-python-agent-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/ironic-python-agent-jobs.yaml
new file mode 100644
index 0000000000..0f3673b770
--- /dev/null
+++ b/modules/openstack_project/files/jenkins_job_builder/config/ironic-python-agent-jobs.yaml
@@ -0,0 +1,28 @@
+- job:
+    name: 'ironic-python-agent-buildimage-coreos'
+    node: 'bare-trusty'
+
+    builders:
+      - link-logs
+      - net-info
+      - gerrit-git-prep
+      - shell: |
+          #!/bin/bash -xe
+          sudo apt-get update
+          sudo apt-get install docker.io
+          sudo ln -sf /usr/bin/docker.io /usr/local/bin/docker
+          sudo sed -i '$acomplete -F _docker docker' /etc/bash_completion.d/docker.io
+          make
+          tar czf $WORKSPACE/ipa-coreos.tar.gz $HOME/UPLOAD/coreos_production_pxe_image-oem.cpio.gz $HOME/UPLOAD/coreos_production_pxe.vmlinuz
+          echo "CoreOS IPA image uploaded to: http://tarballs.openstack.org/ironic-python-agent/coreos/ipa-coreos.tar.gz"
+
+
+    publishers:
+      - scp:
+          site: 'tarballs.openstack.org'
+          files:
+            - source: 'ipa-coreos.tar.gz'
+              target: 'tarballs/ironic-python-agent/coreos/ipa-coreos.tar.gz'
+              keep-hierarchy: false
+              copy-after-failure: false
+      - console-log
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index cb00d8d9ac..afa2f8f76d 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2073,6 +2073,8 @@ projects:
       - gate-ironic-python-agent-pep8
       - gate-ironic-python-agent-python26
       - gate-ironic-python-agent-python27
+    post:
+      - ironic-python-agent-buildimage-coreos
 
   # This is not strictly necessary; there is currently a transitive
   # relationship between g-t-dsvm,