diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index fa26ec8f74..ed2024ff90 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -54,8 +54,6 @@ clouds:
       project_name: '<%= infracloud_project %>'
       user_domain_name: 'infra'
       project_domain_name: 'infra'
-      auth_url: 'https://controller00.hpuswest.ic.openstack.org:35357/v3'
-    auth_type: 'v3password'
+      auth_url: 'https://controller00.hpuswest.ic.openstack.org:35357/'
     cacert: '/home/nodepool/.config/openstack/infracloud_west_cacert.pem'
     identity_api_version: '3'
-    floating_ip_source: 'None'
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index b2318f572e..015652238f 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -80,33 +80,29 @@ clouds:
   openstackjenkins-infracloud-west:
     region_name: RegionOne
     auth:
-      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3
+      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
       username: <%= @puppetmaster_clouds['openstackjenkins_infracloud_username'] %>
       password: <%= @puppetmaster_clouds['openstackjenkins_infracloud_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackjenkins_infracloud_project_name'] %>
       project_domain_name: 'infra'
       user_domain_name: 'infra'
     cacert: '/etc/openstack/infracloud_west_cacert.pem'
-    auth_type: 'v3password'
     identity_api_version: '3'
-    floating_ip_source: 'None'
   openstackci-infracloud-west:
     region_name: RegionOne
     auth:
-      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3
+      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
       username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
       password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
       project_domain_name: 'infra'
       user_domain_name: 'infra'
     cacert: '/etc/openstack/infracloud_west_cacert.pem'
-    auth_type: 'v3password'
     identity_api_version: '3'
-    floating_ip_source: 'None'
   admin-infracloud-west:
     region_name: RegionOne
     auth:
-      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3
+      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
       username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
       password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index b85cc4dfe0..13badf3eb1 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -41,13 +41,11 @@ clouds:
   openstackci-infracloud-west:
     region_name: RegionOne
     auth:
-      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3
+      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
       username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
       password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
       project_domain_name: 'infra'
       user_domain_name: 'infra'
     cacert: '/etc/openstack/infracloud_west_cacert.pem'
-    auth_type: 'v3password'
     identity_api_version: '3'
-    floating_ip_source: 'None'