diff --git a/packstack/puppet/templates/heat_cfn.pp b/packstack/puppet/templates/heat_cfn.pp
index 18100fa31..eae4f7a65 100644
--- a/packstack/puppet/templates/heat_cfn.pp
+++ b/packstack/puppet/templates/heat_cfn.pp
@@ -1,3 +1,10 @@
 
 class { 'heat::api_cfn':
 }
+
+class { 'heat::keystone::auth_cfn':
+  admin_address      => '%(CONFIG_CONTROLLER_HOST)s',
+  public_address     => '%(CONFIG_CONTROLLER_HOST)s',
+  internal_address   => '%(CONFIG_CONTROLLER_HOST)s',
+  password           => '%(CONFIG_HEAT_KS_PW)s'
+}