diff --git a/packstack/puppet/templates/heat.pp b/packstack/puppet/templates/heat.pp
index 61ebad509..fc030127d 100644
--- a/packstack/puppet/templates/heat.pp
+++ b/packstack/puppet/templates/heat.pp
@@ -8,6 +8,7 @@ class { 'heat::engine':
   heat_waitcondition_server_url => "http://${heat_cfg_ctrl_host}:8000/v1/waitcondition",
   heat_watch_server_url         => "http://${heat_cfg_ctrl_host}:8003",
   auth_encryption_key           => hiera('CONFIG_HEAT_AUTH_ENC_KEY'),
+  configure_delegated_roles     => false,
 }
 
 keystone_user_role { 'admin@admin':