diff --git a/contrail/environment/modules/contrail/manifests/profile/openstack/heat.pp b/contrail/environment/modules/contrail/manifests/profile/openstack/heat.pp
index 959ec217..2efc839a 100644
--- a/contrail/environment/modules/contrail/manifests/profile/openstack/heat.pp
+++ b/contrail/environment/modules/contrail/manifests/profile/openstack/heat.pp
@@ -25,6 +25,7 @@
   $kombu_ssl_ca_certs = $::contrail::params::kombu_ssl_ca_certs,
   $kombu_ssl_certfile = $::contrail::params::kombu_ssl_certfile,
   $kombu_ssl_keyfile  = $::contrail::params::kombu_ssl_keyfile,
+  $keystone_version   = $::contrail::params::keystone_version
 ) {
 
   if ($internal_vip != '' and $internal_vip != undef) {
@@ -45,7 +46,7 @@
     $mysql_ip_address  = $host_control_ip
   }
 
-  $auth_uri = "http://${keystone_ip_to_use}:5000/"
+  $auth_uri = "http://${keystone_ip_to_use}:5000/${keystone_version}"
   $database_credentials = join([$service_password, "@", $mysql_ip_address],'')
   $keystone_db_conn = join(["mysql://heat:",$database_credentials,$mysql_port_url],'')