diff --git a/elk_metrics_6x/templates/99-elasticsearch-output.conf.j2 b/elk_metrics_6x/templates/99-elasticsearch-output.conf.j2
index dd6175ae..1a27e0f8 100644
--- a/elk_metrics_6x/templates/99-elasticsearch-output.conf.j2
+++ b/elk_metrics_6x/templates/99-elasticsearch-output.conf.j2
@@ -1,8 +1,17 @@
 output {
-  elasticsearch {
-    hosts => {{ elasticsearch_data_hosts | shuffle(seed=inventory_hostname) | to_json }}
-    sniffing => {{ (not data_node | bool) | lower }}
-    manage_template => {{ (data_node | bool) | lower }}
-    index => "%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}"
+  if [@metadata][version] {
+    elasticsearch {
+      hosts => {{ elasticsearch_data_hosts | shuffle(seed=inventory_hostname) | to_json }}
+      sniffing => {{ (not data_node | bool) | lower }}
+      manage_template => {{ (data_node | bool) | lower }}
+      index => "%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}"
+    }
+  } else {
+    elasticsearch {
+      hosts => {{ elasticsearch_data_hosts | shuffle(seed=inventory_hostname) | to_json }}
+      sniffing => {{ (not data_node | bool) | lower }}
+      manage_template => {{ (data_node | bool) | lower }}
+      index => "%{[@metadata][beat]}-%{+YYYY.MM.dd}"
+    }
   }
 }