diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml
index 529e13bfc5..8a4deac079 100644
--- a/deployment/heat/heat-api-container-puppet.yaml
+++ b/deployment/heat/heat-api-container-puppet.yaml
@@ -157,6 +157,7 @@ outputs:
                 params:
                   $NETWORK: {get_param: [ServiceNetMap, HeatApiNetwork]}
             heat::wsgi::apache_api::ssl: {get_param: EnableInternalTLS}
+            heat::wsgi::apache_api::vhost_custom_fragment: 'Timeout 600'
             heat::policy::policies: {get_param: HeatApiPolicies}
             heat::api::service_name: 'httpd'
             # NOTE: bind IP is found in hiera replacing the network name with the local node IP
diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml
index 62b09c896a..05a4038171 100644
--- a/deployment/heat/heat-base-puppet.yaml
+++ b/deployment/heat/heat-base-puppet.yaml
@@ -186,4 +186,3 @@ outputs:
             heat::cron::purge_deleted::age_type: {get_param: HeatCronPurgeDeletedAgeType}
             heat::cron::purge_deleted::destination: {get_param: HeatCronPurgeDeletedDestination}
             heat::max_json_body_size: {get_param: HeatMaxJsonBodySize}
-            heat::wsgi::apache::vhost_custom_fragment: 'Timeout 600'