diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index 78bb8e9ccd..f928e8b942 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -40,10 +40,13 @@ clouds:
     floating_ip_source: neutron
   bluebox-sjc1:
     auth:
+      auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5000
       username: '<%= @bluebox_username %>'
       password: '<%= @bluebox_password %>'
       project_name: '<%= @bluebox_project %>'
-      auth_url: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5001/v2.0'
+      project_domain_name: default
+      user_domain_name: default
+    identity_api_version: '3'
   internap:
     profile: internap
     region_name: nyj01
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index d173379d27..b22b344969 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -2,10 +2,13 @@ clouds:
   admin-bluebox:
     region_name: RegionOne
     auth:
-      auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5001/v2.0
+      auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5000
       username: <%= @puppetmaster_clouds['admin_bluebox_username'] %>
       password: <%= @puppetmaster_clouds['admin_bluebox_password'] %>
       project_name: <%= @puppetmaster_clouds['admin_bluebox_project_name'] %>
+      project_domain_name: default
+      user_domain_name: default
+    identity_api_version: '3'
   infra-files-ro:
     profile: rackspace
     auth:
@@ -23,10 +26,13 @@ clouds:
   openstackci-bluebox:
     region_name: RegionOne
     auth:
-      auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5001/v2.0
+      auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5000
       username: <%= @puppetmaster_clouds['openstackci_bluebox_username'] %>
       password: <%= @puppetmaster_clouds['openstackci_bluebox_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackci_bluebox_project_name'] %>
+      project_domain_name: default
+      user_domain_name: default
+    identity_api_version: '3'
   openstackci-internap:
     region_name: nyj01
     profile: internap
@@ -69,10 +75,13 @@ clouds:
   openstackjenkins-bluebox:
     region_name: RegionOne
     auth:
-      auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5001/v2.0
+      auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5000
       username: <%= @puppetmaster_clouds['openstackjenkins_bluebox_username'] %>
       password: <%= @puppetmaster_clouds['openstackjenkins_bluebox_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackjenkins_bluebox_project_name'] %>
+      project_domain_name: default
+      user_domain_name: default
+    identity_api_version: '3'
   openstackjenkins-rax:
     regions:
       - DFW