diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 2bbe008275..3fb0740173 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -520,9 +520,8 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
-        setup: prepare_node_devstack.sh
+        diskimage: devstack-precise
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise-dib
@@ -537,9 +536,8 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty
-        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
-        setup: prepare_node_devstack.sh
+        diskimage: devstack-trusty
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty-dib
@@ -618,9 +616,8 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
-        setup: prepare_node_devstack.sh
+        diskimage: devstack-precise
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise-dib
@@ -631,13 +628,12 @@ providers:
       - name: bare-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
-        setup: prepare_node_bare.sh
+        setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty
-        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
-        setup: prepare_node_devstack.sh
+        diskimage: devstack-trusty
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty-dib
@@ -716,9 +712,8 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
-        setup: prepare_node_devstack.sh
+        diskimage: devstack-precise
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise-dib
@@ -733,9 +728,8 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty
-        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
-        setup: prepare_node_devstack.sh
+        diskimage: devstack-trusty
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty-dib
@@ -815,9 +809,8 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
-        setup: prepare_node_devstack.sh
+        diskimage: devstack-precise
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise-dib
@@ -832,9 +825,8 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty
-        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
-        setup: prepare_node_devstack.sh
+        diskimage: devstack-trusty
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty-dib
@@ -915,9 +907,8 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
-        setup: prepare_node_devstack.sh
+        diskimage: devstack-precise
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise-dib
@@ -932,9 +923,8 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty
-        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
-        setup: prepare_node_devstack.sh
+        diskimage: devstack-trusty
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty-dib
@@ -1091,6 +1081,19 @@ targets:
       credentials-id: '<%= jenkins_credentials_id %>'
 
 diskimages:
+  - name: devstack-trusty
+    elements:
+      - ubuntu
+      - vm
+      - openstack-repos
+      - puppet
+      - nodepool-base
+      - node-devstack
+    release: trusty
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_IMAGE_CACHE: /opt/dib_cache
+      QEMU_IMG_OPTIONS: compat=0.10
   - name: devstack-trusty-dib
     elements:
       - ubuntu
@@ -1104,6 +1107,19 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_IMAGE_CACHE: /opt/dib_cache
       QEMU_IMG_OPTIONS: compat=0.10
+  - name: devstack-precise
+    elements:
+      - ubuntu
+      - vm
+      - openstack-repos
+      - puppet
+      - nodepool-base
+      - node-devstack
+    release: precise
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_IMAGE_CACHE: /opt/dib_cache
+      QEMU_IMG_OPTIONS: compat=0.10
   - name: devstack-precise-dib
     elements:
       - ubuntu