diff --git a/journalbeat/journalbeat.yml b/journalbeat/journalbeat.yml
index 75526e02f410489f24788d37338ef2016791c555..d8d0adf499094a281a72d63798120e9ac983e4d3 100644
--- a/journalbeat/journalbeat.yml
+++ b/journalbeat/journalbeat.yml
@@ -2,6 +2,11 @@
 output.elasticsearch:
   hosts:
     - https://elasticsearch.shore.co.il:443
+  index: &index 'filebeat-%{[agent.version]}-%{+yyyy.MM.dd}'
+
+setup.template:
+  name: 'filebeat-%{[agent.version]}'
+  pattern: *index
 
 logging:
   level: warning