diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index 31a1ca6db6..98910ba7d3 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -164,21 +164,22 @@ clouds:
       username: <%= @puppetmaster_clouds['openstack_rax_username'] %>
       password: <%= @puppetmaster_clouds['openstack_rax_password'] %>
       project_id: <%= @puppetmaster_clouds['openstack_rax_project_id'] %>
-  # TODO(pabelanger): move this to openstackci-tripleo-test-cloud-rh1 to be
-  # consistant with other cloud providers
-  openstack-nodepool-tripleo:
+  openstackci-tripleo-test-cloud-rh1:
     auth:
-      auth_url: https://ci-overcloud.rh1.tripleo.org:13000/v2.0
-      username: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_username'] %>
-      password: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_project_name'] %>
+      auth_url: https://ci-overcloud.rh1.tripleo.org:13000
+      username: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_username'] %>
+      password: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_project_name'] %>
+      project_domain_name: default
+      user_domain_name: default
     floating_ip_source: neutron
+    identity_api_version: '3'
   openstackzuul-tripleo-test-cloud-rh1:
     auth:
       auth_url: https://ci-overcloud.rh1.tripleo.org:13000
-      username: <%= @puppetmaster_clouds['openstackzuul_tripleo_username'] %>
-      password: <%= @puppetmaster_clouds['openstackzuul_tripleo_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackzuul_tripleo_project_name'] %>
+      username: <%= @puppetmaster_clouds['openstackzuul_tripleo_test_cloud_rh1_username'] %>
+      password: <%= @puppetmaster_clouds['openstackzuul_tripleo_test_cloud_rh1_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackzuul_tripleo_test_cloud_rh1_project_name'] %>
       project_domain_name: default
       user_domain_name: default
     floating_ip_source: neutron
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index bff0cd70de..7bd6f261af 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -67,9 +67,13 @@ clouds:
     region_name: regionOne
     auth:
       auth_url: 'https://ci-overcloud.rh1.tripleo.org:13000'
-      username: <%= @puppetmaster_clouds['openstackci_tripleo_username'] %>
-      password: <%= @puppetmaster_clouds['openstackci_tripleo_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackci_tripleo_project_name'] %>
+      username: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_username'] %>
+      password: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_project_name'] %>
+      project_domain_name: default
+      user_domain_name: default
+    floating_ip_source: neutron
+    identity_api_version: '3'
   openstackci-bluebox:
     region_name: RegionOne
     auth: