diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
index 7d790cbe66..475c289d9b 100644
--- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
@@ -12,9 +12,9 @@ clouds:
       - IAD
     api_timeout: 60
     auth:
-      username: '{{ rackspace_username }}'
-      password: '{{ rackspace_password }}'
-      project_id: '{{ rackspace_project }}'
+      username: '{{ nodepool_rackspace_username }}'
+      password: '{{ nodepool_rackspace_password }}'
+      project_id: '{{ nodepool_rackspace_project }}'
     force_ipv4: true
   ovh:
     profile: ovh
@@ -26,16 +26,16 @@ clouds:
       - GRA1
     api_timeout: 60
     auth:
-      username: '{{ ovh_username }}'
-      password: '{{ ovh_password }}'
-      project_name: '{{ ovh_project }}'
+      username: '{{ nodepool_ovh_username }}'
+      password: '{{ nodepool_ovh_password }}'
+      project_name: '{{ nodepool_ovh_project }}'
   inap:
     profile: internap
     api_timeout: 60
     auth:
-      username: '{{ internap_username }}'
-      password: '{{ internap_password }}'
-      project_name: '{{ internap_project }}'
+      username: '{{ nodepool_internap_username }}'
+      password: '{{ nodepool_internap_password }}'
+      project_name: '{{ nodepool_internap_project }}'
     regions:
       - name: mtl01
         values:
@@ -50,9 +50,9 @@ clouds:
     api_timeout: 60
     auth_type: password
     auth:
-      username: '{{ vexxhost_username }}'
-      password: '{{ vexxhost_password }}'
-      project_name: '{{ vexxhost_project }}'
+      username: '{{ nodepool_vexxhost_username }}'
+      password: '{{ nodepool_vexxhost_password }}'
+      project_name: '{{ nodepool_vexxhost_project }}'
       project_domain_name: default
       user_domain_name: default
     image_format: 'raw'
@@ -65,8 +65,8 @@ clouds:
     profile: citycloud
     api_timeout: 60
     auth:
-      username: '{{ citycloud_username }}'
-      password: '{{ citycloud_password }}'
+      username: '{{ nodepool_citycloud_username }}'
+      password: '{{ nodepool_citycloud_password }}'
       project_id: bed89257500340af8d0fbe7141b1bfd6
       project_domain_id: a5e7d1a8f25b42b081cf89d1130638da
       user_domain_id: a5e7d1a8f25b42b081cf89d1130638da
@@ -76,9 +76,9 @@ clouds:
     identity_api_version: '3'
     auth:
       auth_url: https://cn1.linaro.cloud:35357
-      username: '{{ linaro_username }}'
-      password: '{{ linaro_password }}'
-      project_name: '{{ linaro_project }}'
+      username: '{{ nodepool_linaro_username }}'
+      password: '{{ nodepool_linaro_password }}'
+      project_name: '{{ nodepool_linaro_project }}'
       project_domain_name: default
       user_domain_name: default
   limestone:
@@ -92,8 +92,8 @@ clouds:
               nat_destination: true
     auth:
       auth_url: https://osa.continuous.pw:5000
-      username: '{{ limestone_username }}'
-      password: '{{ limestone_password }}'
+      username: '{{ nodepool_limestone_username }}'
+      password: '{{ nodepool_limestone_password }}'
       project_name: '{{ limestone_project }}'
       user_domain_name: default
       project_domain_name: default
@@ -110,9 +110,9 @@ clouds:
               default_interface: True
     auth:
       auth_url: https://packet.platform9.net/keystone
-      username: '{{ packethost_username }}'
-      password: '{{ packethost_password }}'
-      project_name: '{{ packethost_project }}'
+      username: '{{ nodepool_packethost_username }}'
+      password: '{{ nodepool_packethost_password }}'
+      project_name: '{{ nodepool_packethost_project }}'
       user_domain_name: default
       project_domain_name: default
     identity_api_version: '3'
diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2
index 77e3e2b12f..4d63119fc2 100644
--- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2
@@ -1,24 +1,24 @@
 # Necessary for fake clouds.yaml to be written
-rackspace_username: user
-rackspace_password: password
-rackspace_project: project
-ovh_username: user
-ovh_password: password
-ovh_project: project
-internap_username: user
-internap_password: password
-internap_project: project
-vexxhost_username: user
-vexxhost_password: password
-vexxhost_project: project
-citycloud_username: user
-citycloud_password: password
-linaro_username: user
-linaro_password: password
-linaro_project: project
-limestone_username: user
-limestone_password: password
-limestone_project: project
-packethost_username: user
-packethost_password: password
-packethost_project: project
+nodepool_rackspace_username: user
+nodepool_rackspace_password: password
+nodepool_rackspace_project: project
+nodepool_ovh_username: user
+nodepool_ovh_password: password
+nodepool_ovh_project: project
+nodepool_internap_username: user
+nodepool_internap_password: password
+nodepool_internap_project: project
+nodepool_vexxhost_username: user
+nodepool_vexxhost_password: password
+nodepool_vexxhost_project: project
+nodepool_citycloud_username: user
+nodepool_citycloud_password: password
+nodepool_linaro_username: user
+nodepool_linaro_password: password
+nodepool_linaro_project: project
+nodepool_limestone_username: user
+nodepool_limestone_password: password
+nodepool_limestone_project: project
+nodepool_packethost_username: user
+nodepool_packethost_password: password
+nodepool_packethost_project: project