diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index fe206907a5..7fee37611d 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -272,13 +272,13 @@ providers:
     max-servers: 48
     images:
       - name: devstack-precise
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 8192
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-precise
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 8192
         setup: prepare_node_bare.sh
         username: jenkins
@@ -290,7 +290,7 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 8192
         setup: prepare_node_py3k.sh
         username: jenkins
@@ -307,13 +307,13 @@ providers:
     max-servers: 192
     images:
       - name: devstack-precise
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 8192
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-precise
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 8192
         setup: prepare_node_bare.sh
         username: jenkins
@@ -325,7 +325,7 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 8192
         setup: prepare_node_py3k.sh
         username: jenkins
@@ -342,13 +342,13 @@ providers:
     max-servers: 48
     images:
       - name: devstack-precise
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 8192
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-precise
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 8192
         setup: prepare_node_bare.sh
         username: jenkins
@@ -360,7 +360,7 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 8192
         setup: prepare_node_py3k.sh
         username: jenkins
@@ -377,7 +377,7 @@ providers:
     max-servers: 0
     images:
       - name: devstack-precise-check
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 8192
         setup: prepare_node_devstack.sh
         username: jenkins
@@ -394,19 +394,19 @@ providers:
     max-servers: 200
     images:
       - name: devstack-precise-check
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 30720
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 30720
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-precise
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 30720
         setup: prepare_node_bare.sh
         username: jenkins
@@ -418,7 +418,7 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
-        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
+        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 30720
         setup: prepare_node_py3k.sh
         username: jenkins