diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml
index d294718239..5e13a32e20 100644
--- a/ci/environments/scenario001-standalone.yaml
+++ b/ci/environments/scenario001-standalone.yaml
@@ -51,6 +51,7 @@ parameter_defaults:
     # in sync with the archive policy, 60s too.
     ceilometer::agent::polling::polling_interval: 15
   ManagePolling: true
+  HeatConfigureDelegatedRoles: true
   ManagePipeline: true
   PipelinePublishers:
     - gnocchi://?archive_policy=ceilometer-high-rate
diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml
index 31ee99e7a9..a0c6de7398 100644
--- a/deployment/heat/heat-engine-container-puppet.yaml
+++ b/deployment/heat/heat-engine-container-puppet.yaml
@@ -97,6 +97,10 @@ parameters:
     type: comma_delimited_list
     default: []
     description: An array of directories to search for plug-ins.
+  HeatConfigureDelegatedRoles:
+    type: boolean
+    default: false
+    description: Create delegated roles
 
 conditions:
   heat_workers_unset: {equals : [{get_param: HeatWorkers}, 0]}
@@ -143,7 +147,7 @@ outputs:
         map_merge:
           - get_attr: [HeatBase, role_data, config_settings]
           - apache::default_vhost: false
-            heat::engine::configure_delegated_roles: false
+            heat::engine::configure_delegated_roles: {get_param: HeatConfigureDelegatedRoles}
             heat::engine::trusts_delegated_roles: []
             heat::engine::max_nested_stack_depth: {get_param: HeatMaxNestedStackDepth}
             heat::engine::max_resources_per_stack: {get_param: HeatMaxResourcesPerStack}