diff --git a/templates/logstash/config/logstash/pipeline/filebeat.conf.j2 b/templates/logstash/config/logstash/pipeline/filebeat.conf.j2
index 733705a..eb22a70 100644
--- a/templates/logstash/config/logstash/pipeline/filebeat.conf.j2
+++ b/templates/logstash/config/logstash/pipeline/filebeat.conf.j2
@@ -94,7 +94,7 @@ output {
             manage_template => false
        }
     }
-    else if [kubernetes][namespace] {
+    else if [kubernetes][namespace] and [kubernetes][deployment][name] {
         elasticsearch {
             hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
             cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
@@ -106,6 +106,18 @@ output {
             manage_template => false
        }
     }
+    else if [kubernetes][namespace] {
+        elasticsearch {
+            hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
+            cacert => "/usr/share/logstash/config/certificates/ca/ca.crt"
+            user => "{{ elastic_admin_username }}"
+            password => "{{ elastic_admin_password }}"
+
+            index => "uncategorized-kubernetes-%{[kubernetes][namespace]}-%{+YYYY.MM}"
+
+            manage_template => false
+       }
+    }
     else if [container][name] and [@metadata][beat] {
         elasticsearch {
             hosts => ["https://{{ shared_service_elastic_stack_01_hostname }}:{{ service_port_elasticsearch }}"]
@@ -125,7 +137,7 @@ output {
             user => "{{ elastic_admin_username }}"
             password => "{{ elastic_admin_password }}"
 
-            index => "%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM}"
+            index => "uncategorized-%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM}"
 
             manage_template => false
        }