diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml
index 1880a5bd9f..a8c328e78b 100644
--- a/deployment/heat/heat-api-cfn-container-puppet.yaml
+++ b/deployment/heat/heat-api-cfn-container-puppet.yaml
@@ -141,9 +141,9 @@ outputs:
                   "%{hiera('fqdn_$NETWORK')}"
                 params:
                   $NETWORK: {get_param: [ServiceNetMap, HeatApiCfnNetwork]}
-            if:
-            - heat_workers_set
-            - heat::wsgi::apache_api_cfn::workers: {get_param: HeatWorkers}
+          - if:
+              - heat_workers_set
+              - heat::wsgi::apache_api_cfn::workers: {get_param: HeatWorkers}
       service_config_settings:
         rsyslog:
           tripleo_logging_sources_heat_api_cfn:
diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml
index becb4183fc..6a59b9f579 100644
--- a/deployment/heat/heat-api-container-puppet.yaml
+++ b/deployment/heat/heat-api-container-puppet.yaml
@@ -171,7 +171,7 @@ outputs:
                   "%{hiera('fqdn_$NETWORK')}"
                 params:
                   $NETWORK: {get_param: [ServiceNetMap, HeatApiNetwork]}
-            if:
+          - if:
               - heat_workers_set
               - heat::wsgi::apache_api::workers: {get_param: HeatWorkers}
       service_config_settings:
diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml
index c35dec0d41..c0a30f30f3 100644
--- a/deployment/heat/heat-base-puppet.yaml
+++ b/deployment/heat/heat-base-puppet.yaml
@@ -151,8 +151,7 @@ outputs:
       service_name: heat_base
       config_settings:
         map_merge:
-          -
-            if:
+          - if:
             - cors_allowed_origin_set
             - heat::cors::allowed_origin: {get_param: HeatCorsAllowedOrigin}
           - heat::notification_driver: {get_param: NotificationDriver}
@@ -196,11 +195,10 @@ 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::cache::enabled: {get_param: EnableCache}
+          - heat::cache::enabled: {get_param: EnableCache}
             heat::cache::tls_enabled: {get_param: MemcachedTLS}
             heat::cache::resource_finder_caching: false
-            if:
+          - if:
               - tls_cache_enabled
               - heat::cache::backend: 'dogpile.cache.pymemcache'
               - heat::cache::backend: 'dogpile.cache.memcached'
diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml
index f6d5b44234..7221d2a4ba 100644
--- a/deployment/heat/heat-engine-container-puppet.yaml
+++ b/deployment/heat/heat-engine-container-puppet.yaml
@@ -193,7 +193,7 @@ outputs:
             heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}
             heat::engine::auth_encryption_key: {get_param: HeatAuthEncryptionKey}
             heat::engine::plugin_dirs: {get_param: HeatEnginePluginDirs}
-            if:
+          - if:
             - heat_workers_set
             - heat::engine::num_engine_workers: {get_param: HeatWorkers}
       service_config_settings: