diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index 9dd4e5f6..0f14bd3b 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -3,7 +3,7 @@ certstore_rpm_version:
 
 firewall_rpm_version:
   conn_telemetry: conn_telemetry-1.0.3.4ef6df6
-  firewall: firewall-3.4.6.a9759d7
+  firewall: firewall-3.4.7.8b0271e
   glimpse_detector: glimpse_detector-3.1.1.6b887d8
   qdpi_detector: qdpi_detector-5.0.0.75424a0
   dns: dns-2.1.7.1da8dfa
diff --git a/ansible/roles/traffic-engine/files/helm/conf/firewall_logger_transmitter_schema.json b/ansible/roles/traffic-engine/files/helm/conf/firewall_logger_transmitter_schema.json
index f32349b6..f5df2bee 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/firewall_logger_transmitter_schema.json
+++ b/ansible/roles/traffic-engine/files/helm/conf/firewall_logger_transmitter_schema.json
@@ -178,8 +178,8 @@
             {{- end }}
             "async": "on",
             "name": "POLICY-PACKET-TRAFFIC-FILE-STREAM-RECORD",
-            "topic": "TRAFFIC-FILE-STREAM-RECORD",
-            "client_id": "TRAFFIC-FILE-STREAM-RECORD",
+            "topic": "TRAFFIC-POLICY-CAPTURE-FILE-STREAM-RECORD",
+            "client_id": "TRAFFIC-POLICY-CAPTURE-FILE-STREAM-RECORD",
             "mode": [
                 {
                     "channel": "kafka",
@@ -197,8 +197,8 @@
             {{- end }}
             "async": "on",
             "name": "HTTP-REQ-BODY-TRAFFIC-FILE-STREAM-RECORD",
-            "topic": "TRAFFIC-FILE-STREAM-RECORD",
-            "client_id": "TRAFFIC-FILE-STREAM-RECORD",
+            "topic": "TRAFFIC-HTTP-FILE-STREAM-RECORD",
+            "client_id": "TRAFFIC-HTTP-FILE-STREAM-RECORD",
             "mode": [
                 {
                     "channel": "kafka",
@@ -216,8 +216,8 @@
             {{- end }}
             "async": "on",
             "name": "HTTP-RES-BODY-TRAFFIC-FILE-STREAM-RECORD",
-            "topic": "TRAFFIC-FILE-STREAM-RECORD",
-            "client_id": "TRAFFIC-FILE-STREAM-RECORD",
+            "topic": "TRAFFIC-HTTP-FILE-STREAM-RECORD",
+            "client_id": "TRAFFIC-HTTP-FILE-STREAM-RECORD",
             "mode": [
                 {
                     "channel": "kafka",
@@ -235,8 +235,8 @@
             {{- end }}
             "async": "on",
             "name": "MAIL-EML-TRAFFIC-FILE-STREAM-RECORD",
-            "topic": "TRAFFIC-FILE-STREAM-RECORD",
-            "client_id": "TRAFFIC-FILE-STREAM-RECORD",
+            "topic": "TRAFFIC-EML-FILE-STREAM-RECORD",
+            "client_id": "TRAFFIC-EML-FILE-STREAM-RECORD",
             "mode": [
                 {
                     "channel": "kafka",
@@ -254,8 +254,8 @@
             {{- end }}
             "async": "on",
             "name": "RTP-PACKET-TRAFFIC-FILE-STREAM-RECORD",
-            "topic": "TRAFFIC-FILE-STREAM-RECORD",
-            "client_id": "TRAFFIC-FILE-STREAM-RECORD",
+            "topic": "TRAFFIC-RTP-FILE-STREAM-RECORD",
+            "client_id": "TRAFFIC-RTP-FILE-STREAM-RECORD",
             "mode": [
                 {
                     "channel": "kafka",