diff --git a/Filebeat/filebeat.docker.yml b/Filebeat/filebeat.docker.yml
index a44474e..c9bbfda 100644
--- a/Filebeat/filebeat.docker.yml
+++ b/Filebeat/filebeat.docker.yml
@@ -12,4 +12,10 @@ processors:
 - add_cloud_metadata: ~
 
 output.elasticsearch:
-  hosts: '${ELASTICSEARCH_HOSTS:elc-0.zipper.release11.com:9200}'
\ No newline at end of file
+  hosts: '${ELASTICSEARCH_HOSTS:elc-0.zipper.release11.com:9200}'
+  index: 'xmltools-${ENV_TYPE:dev}-%{+YYYY.MM}'
+
+
+setup.template:
+  name: "xmltools"
+  pattern: "xmltools-*"
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 980e095..6a620bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,7 @@ services:
             - "/var/lib/docker/containers:/var/lib/docker/containers:ro"
             - "/var/run/docker.sock:/var/run/docker.sock:ro"
         environment:
-            - ENV_TYPE=dev
+            - ENV_TYPE
         command:
             - "-e"
             - "--strict.perms=false"