diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 2e3986715d..f5d98457cd 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -533,6 +533,8 @@ resources:
           ServiceConfigSettings: {get_attr: [{{role.name}}ServiceConfigSettings, value]}
           ServiceNames: {get_attr: [{{role.name}}ServiceNames, value]}
           MonitoringSubscriptions: {get_attr: [{{role.name}}ServiceChainRoleData, value, monitoring_subscriptions]}
+          LoggingSources: {get_attr: [{{role.name}}ServiceChainRoleData, value, logging_sources]}
+          LoggingGroups: {get_attr: [{{role.name}}ServiceChainRoleData, value, logging_groups]}
           ServiceMetadataSettings: {get_attr: [{{role.name}}ServiceChainRoleData, value, service_metadata_settings]}
           DeploymentServerBlacklistDict: {get_attr: [DeploymentServerBlacklistDict, value]}
           RoleParameters: {get_param: {{role.name}}Parameters}
@@ -623,24 +625,6 @@ resources:
           - ','
 {% for role in roles %}
           - {get_attr: [{{role.name}}ServiceNames, value]}
-{% endfor %}
-      logging_groups:
-        yaql:
-          expression: >
-            $.data.groups.flatten()
-          data:
-            groups:
-{% for role in roles %}
-              - {get_attr: [{{role.name}}ServiceChainRoleData, value, logging_groups]}
-{% endfor %}
-      logging_sources:
-        yaql:
-          expression: >
-            $.data.sources.flatten()
-          data:
-            sources:
-{% for role in roles %}
-              - {get_attr: [{{role.name}}ServiceChainRoleData, value, logging_sources]}
 {% endfor %}
       controller_ips: {get_attr: [{{primary_role_name}}, ip_address]}
       controller_names: {get_attr: [{{primary_role_name}}, hostname]}
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 3044fe3970..37c1d4e52e 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -16,10 +16,6 @@ parameters:
     type: comma_delimited_list
   controller_ips:
     type: comma_delimited_list
-  logging_groups:
-    type: json
-  logging_sources:
-    type: json
   service_ips:
     type: json
   service_node_names:
@@ -113,8 +109,6 @@ resources:
             bootstrap_nodeid_ip: {get_input: bootstrap_nodeid_ip}
           all_nodes:
            map_merge:
-              - tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: logging_sources}
-              - tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: logging_groups}
               - enabled_services:
                   yaql:
                     expression: $.data.distinct()