diff --git a/jenkins/jobs/diskimage-builder.yaml b/jenkins/jobs/diskimage-builder.yaml
index ef7dec26f0..a70cda3002 100644
--- a/jenkins/jobs/diskimage-builder.yaml
+++ b/jenkins/jobs/diskimage-builder.yaml
@@ -26,9 +26,14 @@
     publishers:
       - console-log
 - job:
-    name: 'dib-buildimage-debian-ironic-agent'
+    name: 'dib-buildimage-debian-ironic'
     node: bare-trusty
 
+    wrappers:
+      - build-timeout:
+          timeout: 60
+      - timestamps
+
     builders:
       - link-logs
       - net-info
@@ -47,19 +52,31 @@
           ./openstack/diskimage-builder/tests/install_test_deps.sh
 
           DIB_RELEASE="jessie" disk-image-create \
-            -o ~/debian-jessie-ironic-agent \
+            -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: 'images/ironic-agent/debian-jessie/'
+              target: >
+                'tarballs/diskimage-builder/images/ironic-agent/debian-jessie/'
               keep-hierarchy: false
               copy-after-failure: false
             - source: 'debian-jessie-ironic-agent.initramfs'
-              target: 'images/ironic-agent/debian-jessie/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 00b4dcc9bf..48655b1835 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4524,7 +4524,7 @@ projects:
       - gate-tempest-dsvm-ironic-pxe_ssh-dib
     post:
       - dib-utils-branch-tarball
-      - dib-buildimage-debian-ironic-agent
+      - dib-buildimage-debian-ironic
 
   - name: openstack/diskimage-builder
     template:
@@ -4547,7 +4547,7 @@ projects:
       - gate-dib-dsvm-functests-devstack-f21
       - gate-tempest-dsvm-ironic-pxe_ssh-dib
     post:
-      - dib-buildimage-debian-ironic-agent
+      - dib-buildimage-debian-ironic
 
   - name: openstack/distil
     template: