diff --git a/packstack/puppet/templates/keystone_heat.pp b/packstack/puppet/templates/keystone_heat.pp
index 2698a2d8d..5b4a7a9a2 100644
--- a/packstack/puppet/templates/keystone_heat.pp
+++ b/packstack/puppet/templates/keystone_heat.pp
@@ -1,10 +1,11 @@
 # heat::keystone::auth
 class { 'heat::keystone::auth':
-  region           => hiera('CONFIG_KEYSTONE_REGION'),
-  password         => hiera('CONFIG_HEAT_KS_PW'),
-  public_address   => hiera('CONFIG_CONTROLLER_HOST'),
-  admin_address    => hiera('CONFIG_CONTROLLER_HOST'),
-  internal_address => hiera('CONFIG_CONTROLLER_HOST'),
+  region                    => hiera('CONFIG_KEYSTONE_REGION'),
+  password                  => hiera('CONFIG_HEAT_KS_PW'),
+  public_address            => hiera('CONFIG_CONTROLLER_HOST'),
+  admin_address             => hiera('CONFIG_CONTROLLER_HOST'),
+  internal_address          => hiera('CONFIG_CONTROLLER_HOST'),
+  configure_delegated_roles => true,
 }
 
 $is_heat_cfn_install = hiera('CONFIG_HEAT_CFN_INSTALL')