diff --git a/logstash/indexer/pipeline/kafka_elasticsearch.conf b/logstash/indexer/pipeline/kafka_elasticsearch.conf
index 7b18fd7..3b74dce 100644
--- a/logstash/indexer/pipeline/kafka_elasticsearch.conf
+++ b/logstash/indexer/pipeline/kafka_elasticsearch.conf
@@ -2,7 +2,25 @@ input {
 	kafka {
         codec =>  json{}
         bootstrap_servers => "kafka:9092"
-        topics => ["random", "apache", "random-forwarder", "apache-forwarder"]
+        topics => ["random"]
+        client_id => "logstash_indexer_1"
+	}
+	kafka {
+        codec =>  json{}
+        bootstrap_servers => "kafka:9092"
+        topics => ["apache"]
+        client_id => "logstash_indexer_1"
+	}
+	kafka {
+        codec =>  json{}
+        bootstrap_servers => "kafka:9092"
+        topics => ["random-forwarder"]
+        client_id => "logstash_indexer_1"
+	}
+	kafka {
+        codec =>  json{}
+        bootstrap_servers => "kafka:9092"
+        topics => ["apache-forwarder"]
         client_id => "logstash_indexer_1"
 	}
 }
diff --git a/logstash/shipper/pipeline/beat_kafka.conf b/logstash/shipper/pipeline/beat_kafka.conf
index 9b2ebc6..fca44a5 100644
--- a/logstash/shipper/pipeline/beat_kafka.conf
+++ b/logstash/shipper/pipeline/beat_kafka.conf
@@ -14,9 +14,7 @@ output {
     bootstrap_servers => "kafka:9092"
 	topic_id => "%{type}"
   }
-  if [type] == "apache-forwarder" || [type] == "random-forwarder" {
-	  stdout {
-		codec => rubydebug
-	  }
+  stdout {
+	codec => rubydebug
   }
 }
\ No newline at end of file