diff --git a/deployment/puppet/heat/lib/puppet/provider/heat_domain_id_setter/ruby.rb b/deployment/puppet/heat/lib/puppet/provider/heat_domain_id_setter/ruby.rb
index 03ee1a1798..14c9c494e5 100644
--- a/deployment/puppet/heat/lib/puppet/provider/heat_domain_id_setter/ruby.rb
+++ b/deployment/puppet/heat/lib/puppet/provider/heat_domain_id_setter/ruby.rb
@@ -93,7 +93,7 @@ def keystone_v2_authenticate(auth_url,
     if tenantName
         post_args['auth']['tenantName'] = tenantName
     end
-
+    auth_url.sub!('v3', 'v2.0')
     url = URI.parse("#{auth_url}/tokens")
     req = Net::HTTP::Post.new url.path
     req['content-type'] = 'application/json'
diff --git a/deployment/puppet/osnailyfacter/modular/heat/heat.pp b/deployment/puppet/osnailyfacter/modular/heat/heat.pp
index ccbb0c3c02..eac8d6fdce 100644
--- a/deployment/puppet/osnailyfacter/modular/heat/heat.pp
+++ b/deployment/puppet/osnailyfacter/modular/heat/heat.pp
@@ -107,7 +107,7 @@ class { 'heat::docker_resource' :
 }
 
 class { 'heat::keystone::domain' :
-  auth_url          => "http://${controller_node_address}:5000/v2.0",
+  auth_url          => "http://${controller_node_address}:35357/v2.0",
   keystone_admin    => 'heat',
   keystone_password => $heat_hash['user_password'],
   keystone_tenant   => 'services',