diff --git a/dev-upgrade/elastic/filebeat.yaml b/dev-upgrade/elastic/filebeat.yaml
index d6f768c..0af5fd6 100644
--- a/dev-upgrade/elastic/filebeat.yaml
+++ b/dev-upgrade/elastic/filebeat.yaml
@@ -34,8 +34,16 @@ data:
       tags: ['json']
 
     #All data to indexed to Elasticsearch
-    output.logstash:
-      hosts: ["logstash.dev.svc:5044"]
+    output.kafka:
+      hosts: ["10.2.0.12:30002","10.2.0.12:30003","10.2.0.12:30004"]
+
+      topic: 'beaconfire-logback-dev'
+      partition.round_robin:
+        reachable_only: false
+
+      required_acks: 1
+      compression: gzip
+      max_message_bytes: 1000000
 
 ---
 apiVersion: apps/v1
diff --git a/prod-upgrade/elastic/filebeat.yaml b/prod-upgrade/elastic/filebeat.yaml
index 8ec8b53..b224ad1 100644
--- a/prod-upgrade/elastic/filebeat.yaml
+++ b/prod-upgrade/elastic/filebeat.yaml
@@ -34,8 +34,16 @@ data:
       tags: ['json']
 
     #All data to indexed to Elasticsearch
-    output.logstash:
-      hosts: ["log-app.beaconfireinc.com:30012"]
+    output.kafka:
+      hosts: ["10.2.0.12:30002","10.2.0.12:30003","10.2.0.12:30004"]
+
+      topic: 'beaconfire-logback-prod'
+      partition.round_robin:
+        reachable_only: false
+
+      required_acks: 1
+      compression: gzip
+      max_message_bytes: 1000000
 
 ---
 apiVersion: apps/v1
diff --git a/tcs-upgrade/elastic/filebeat.yaml b/tcs-upgrade/elastic/filebeat.yaml
index 3fe4a86..ca1288d 100644
--- a/tcs-upgrade/elastic/filebeat.yaml
+++ b/tcs-upgrade/elastic/filebeat.yaml
@@ -34,8 +34,16 @@ data:
       tags: ['json']
 
     #All data to indexed to Elasticsearch
-    output.logstash:
-      hosts: ["logstash.tcs.svc:5044"]
+    output.kafka:
+      hosts: ["10.2.0.12:30002","10.2.0.12:30003","10.2.0.12:30004"]
+
+      topic: 'beaconfire-logback-tcs'
+      partition.round_robin:
+        reachable_only: false
+
+      required_acks: 1
+      compression: gzip
+      max_message_bytes: 1000000
 
 ---
 apiVersion: apps/v1