diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 5b57162d07..a857dc212d 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -65,26 +65,18 @@ labels:
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
+  # Special dib specific labels for testing dib based images
+  # in new providers as we dibify them.
   - name: devstack-trusty-dib
     image: devstack-trusty-dib
     ready-script: configure_mirror.sh
-    min-ready: 1
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
+    min-ready: 0
+    providers: []
   - name: devstack-precise-dib
     image: devstack-precise-dib
     ready-script: configure_mirror.sh
-    min-ready: 1
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
+    min-ready: 0
+    providers: []
   - name: bare-trusty
     image: bare-trusty
     ready-script: configure_mirror.sh
@@ -467,11 +459,6 @@ providers:
         diskimage: devstack-precise
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-precise-dib
-        min-ram: 30720
-        diskimage: devstack-precise-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150127) - Partner Image'
         min-ram: 30720
@@ -483,11 +470,6 @@ providers:
         diskimage: devstack-trusty
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty-dib
-        min-ram: 30720
-        diskimage: devstack-trusty-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
@@ -557,11 +539,6 @@ providers:
         diskimage: devstack-precise
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-precise-dib
-        min-ram: 30720
-        diskimage: devstack-precise-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150127) - Partner Image'
         min-ram: 30720
@@ -573,11 +550,6 @@ providers:
         diskimage: devstack-trusty
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty-dib
-        min-ram: 30720
-        diskimage: devstack-trusty-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
@@ -646,11 +618,6 @@ providers:
         diskimage: devstack-precise
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-precise-dib
-        min-ram: 30720
-        diskimage: devstack-precise-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150127) - Partner Image'
         min-ram: 30720
@@ -662,11 +629,6 @@ providers:
         diskimage: devstack-trusty
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty-dib
-        min-ram: 30720
-        diskimage: devstack-trusty-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
@@ -736,11 +698,6 @@ providers:
         diskimage: devstack-precise
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-precise-dib
-        min-ram: 30720
-        diskimage: devstack-precise-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150127) - Partner Image'
         min-ram: 30720
@@ -752,11 +709,6 @@ providers:
         diskimage: devstack-trusty
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty-dib
-        min-ram: 30720
-        diskimage: devstack-trusty-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
@@ -827,11 +779,6 @@ providers:
         diskimage: devstack-precise
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-precise-dib
-        min-ram: 30720
-        diskimage: devstack-precise-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150127) - Partner Image'
         min-ram: 30720
@@ -843,11 +790,6 @@ providers:
         diskimage: devstack-trusty
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty-dib
-        min-ram: 30720
-        diskimage: devstack-trusty-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140927) - Partner Image'
         min-ram: 30720
@@ -975,19 +917,6 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_IMAGE_CACHE: /opt/dib_cache
       QEMU_IMG_OPTIONS: compat=0.10
-  - name: devstack-trusty-dib
-    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-precise
     elements:
       - ubuntu
@@ -1001,19 +930,6 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_IMAGE_CACHE: /opt/dib_cache
       QEMU_IMG_OPTIONS: compat=0.10
-  - name: devstack-precise-dib
-    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-centos7-dib
     elements:
       - centos7