diff --git a/jenkins/jobs/diskimage-builder.yaml b/jenkins/jobs/diskimage-builder.yaml
index a785cbd111..55ecc28a8e 100644
--- a/jenkins/jobs/diskimage-builder.yaml
+++ b/jenkins/jobs/diskimage-builder.yaml
@@ -36,60 +36,3 @@
 
     publishers:
       - console-log
-
-- job:
-    name: 'dib-buildimage-debian-ironic'
-    node: ubuntu-trusty
-
-    wrappers:
-      - build-timeout:
-          timeout: 60
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - install-distro-packages
-      - shell: |
-          #!/bin/bash -eux
-          cd ~
-
-          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            git://git.openstack.org \
-            openstack/diskimage-builder \
-            openstack/dib-utils
-
-          export PATH=$PATH:$(pwd)/openstack/dib-utils/bin
-          export PATH=$PATH:$(pwd)/openstack/diskimage-builder/bin
-
-          ./openstack/diskimage-builder/tests/install_test_deps.sh
-
-          DIB_RELEASE="jessie" disk-image-create \
-            -o $WORKSPACE/debian-jessie-ironic-agent \
-            debian ironic-agent
-
-          DIB_RELEASE="jessie" disk-image-create \
-            -o $WORKSPACE/debian-jessie-simple-init \
-            debian vm simple-init enable-serial-console
-
-
-    publishers:
-      - scp:
-          site: 'tarballs.openstack.org'
-          files:
-            - source: 'debian-jessie-ironic-agent.vmlinuz'
-              target: >
-                'tarballs/diskimage-builder/images/ironic-agent/debian-jessie/'
-              keep-hierarchy: false
-              copy-after-failure: false
-            - source: 'debian-jessie-ironic-agent.initramfs'
-              target: >
-                'tarballs/diskimage-builder/images/ironic-agent/debian-jessie/'
-              keep-hierarchy: false
-              copy-after-failure: false
-            - source: 'debian-jessie-simple-init.qcow2'
-              target: >
-                'tarballs/diskimage-builder/images/simple-init/debian-jessie/'
-              keep-hierarchy: false
-              copy-after-failure: false
-      - console-log
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 683246c1fe..5837e143bd 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5616,7 +5616,6 @@ projects:
       - gate-dib-utils-tox-func
     post:
       - dib-utils-branch-tarball
-      - dib-buildimage-debian-ironic
 
   - name: openstack/diskimage-builder
     template:
@@ -5637,8 +5636,6 @@ projects:
     gate:
       - gate-dib-dsvm-functests-ubuntu-trusty
       - gate-dib-dsvm-functests-centos-7
-    post:
-      - dib-buildimage-debian-ironic
 
   - name: openstack/distil
     template: