diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2
index 30c59a2d..60107e2e 100644
--- a/ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2
+++ b/ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2
@@ -32,7 +32,7 @@
    sasl_password = "galaxy2019"
 {% raw %}   brokers = [ "{{ olap.kafka_broker.address_list | join("\",\"") }}" ]
 {% endraw %}
-   topic = "POLICY-RULE-METRICS"
+   topic = "POLICY-RULE-METRIC"
    data_format = "json"
    json_timestamp_units = "1ms"
 [[inputs.socket_listener]]
diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2
index 8d348504..a0a02e61 100644
--- a/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2
+++ b/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2
@@ -37,7 +37,7 @@
    sasl_password = "galaxy2019"
 {% raw %}   brokers = [ "{{ olap.kafka_broker.address_list | join("\",\"") }}" ]
 {% endraw %}
-  topic = "POLICY-RULE-METRICS"
+  topic = "POLICY-RULE-METRIC"
   data_format = "json"
   json_timestamp_units = "1ms"
 
diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2
index 99fef355..92d462a8 100644
--- a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2
+++ b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2
@@ -32,7 +32,7 @@
    sasl_password = "galaxy2019"
 {% raw %}   brokers = [ "{{ olap.kafka_broker.address_list | join("\",\"") }}" ]
 {% endraw %}
-   topic = "NETWORK-TRAFFIC-METRICS"
+   topic = "NETWORK-TRAFFIC-METRIC"
    data_format = "json"
    json_timestamp_units = "1ms"
 [[inputs.socket_listener]]
diff --git a/ansible/roles/traffic-engine/files/helm/conf/sce.conf b/ansible/roles/traffic-engine/files/helm/conf/sce.conf
index ceec7885..9a49537a 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/sce.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/sce.conf
@@ -64,7 +64,7 @@ prometheus_listen_port=9006
 prometheus_listen_url=/metrics
 
 [metrics]
-# Kafka Topic: POLICY-RULE-METRICS
+# Kafka Topic: POLICY-RULE-METRIC
 enable=1
 interval_s=1
 telegraf_bind_address=127.0.0.1
diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf
index 57aa77f8..0b1d6f0b 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_proxy.conf
@@ -24,7 +24,7 @@
    sasl_username = "{{ .Values.external_resources.olap.kafka_brokers.sasl_username }}"
    sasl_password = "{{ .Values.external_resources.olap.kafka_brokers.sasl_password }}"
    brokers = [ "{{- include "traffic-engine.config.olap-address"  (list . "\",\"") }}" ]
-   topic = "POLICY-RULE-METRICS"
+   topic = "POLICY-RULE-METRIC"
    data_format = "json"
    json_timestamp_units = "1ms"
 [[inputs.socket_listener]]
diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf
index 10bc7156..a422cffc 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_sce.conf
@@ -66,6 +66,6 @@
    sasl_username = "{{ .Values.external_resources.olap.kafka_brokers.sasl_username }}"
    sasl_password = "{{ .Values.external_resources.olap.kafka_brokers.sasl_password }}"
    brokers = [ "{{- include "traffic-engine.config.olap-address"  (list . "\",\"") }}" ]
-   topic = "POLICY-RULE-METRICS"
+   topic = "POLICY-RULE-METRIC"
    data_format = "json"
    json_timestamp_units = "1ms"
diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf
index 24a62010..57526fae 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf
@@ -30,7 +30,7 @@
    sasl_username = "{{ .Values.external_resources.olap.kafka_brokers.sasl_username }}"
    sasl_password = "{{ .Values.external_resources.olap.kafka_brokers.sasl_password }}"
    brokers = [ "{{- include "traffic-engine.config.olap-address"  (list . "\",\"") }}" ]
-  topic = "POLICY-RULE-METRICS"
+  topic = "POLICY-RULE-METRIC"
   data_format = "json"
   json_timestamp_units = "1ms"
 
diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf
index 16e2ec0b..d0df97b4 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf
@@ -91,7 +91,7 @@
    sasl_username = "{{ .Values.external_resources.olap.kafka_brokers.sasl_username }}"
    sasl_password = "{{ .Values.external_resources.olap.kafka_brokers.sasl_password }}"
    brokers = [ "{{- include "traffic-engine.config.olap-address"  (list . "\",\"") }}" ]
-   topic = "POLICY-RULE-METRICS"
+   topic = "POLICY-RULE-METRIC"
    fielddrop = ["*pkts*max", "*bytes*max", "*session*max", "*queue*max", "*latency*sum"]
    data_format = "json"
    json_timestamp_units = "1ms"
diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf
index 83d3677f..1f4037e3 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf
@@ -24,7 +24,7 @@
    sasl_username = "{{ .Values.external_resources.olap.kafka_brokers.sasl_username }}"
    sasl_password = "{{ .Values.external_resources.olap.kafka_brokers.sasl_password }}"
    brokers = [ "{{- include "traffic-engine.config.olap-address"  (list . "\",\"") }}" ]
-   topic = "NETWORK-TRAFFIC-METRICS"
+   topic = "NETWORK-TRAFFIC-METRIC"
    data_format = "json"
    json_timestamp_units = "1ms"
 [[inputs.socket_listener]]