diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index c90104dc7..e2bd1ad4f 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -403,7 +403,7 @@ include ::apache
 # Heat
 class { '::heat':
   debug                        => hiera('debug'),
-  keystone_ec2_uri             => join(['http://', hiera('controller_host'), ':5000/v2.0/ec2tokens']),
+  keystone_ec2_uri             => join([hiera('keystone_auth_uri_v2'), '/ec2tokens']),
   enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
 }
 heat_config {