diff --git a/components/analytics/logstash/logstash.conf b/components/analytics/logstash/logstash.conf
index 5afd6e3f..67ef24b3 100644
--- a/components/analytics/logstash/logstash.conf
+++ b/components/analytics/logstash/logstash.conf
@@ -124,7 +124,7 @@ output {
   if [type] == "client" {
     elasticsearch {
       hosts => ["${LOGSTASH_OUTPUT_HOST}"]
-      index => "cvat.client"
+      index => "%{[@metadata][target_index_client]}"
       user => "${LOGSTASH_OUTPUT_USER:}"
       password => "${LOGSTASH_OUTPUT_PASS:}"
       manage_template => false
@@ -132,7 +132,7 @@ output {
   } else if [type] == "server" {
     elasticsearch {
       hosts => ["${LOGSTASH_OUTPUT_HOST}"]
-      index => "cvat.server"
+      index => "%{[@metadata][target_index_server]}"
       user => "${LOGSTASH_OUTPUT_USER:}"
       password => "${LOGSTASH_OUTPUT_PASS:}"
       manage_template => false