diff --git a/Filebeat/Dockerfile b/Filebeat/Dockerfile
new file mode 100644
index 0000000..af42363
--- /dev/null
+++ b/Filebeat/Dockerfile
@@ -0,0 +1,2 @@
+FROM docker.elastic.co/beats/filebeat:8.6.2
+COPY --chown=root:filebeat filebeat.docker.yml /usr/share/filebeat/filebeat.yml
\ No newline at end of file
diff --git a/Filebeat/filebeat.docker.yml b/Filebeat/filebeat.docker.yml
new file mode 100644
index 0000000..c9bbfda
--- /dev/null
+++ b/Filebeat/filebeat.docker.yml
@@ -0,0 +1,21 @@
+filebeat.config:
+  modules:
+    path: ${path.config}/modules.d/*.yml
+    reload.enabled: false
+
+filebeat.autodiscover:
+  providers:
+    - type: docker
+      hints.enabled: true
+
+processors:
+- add_cloud_metadata: ~
+
+output.elasticsearch:
+  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 fa20468..6a620bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,6 +50,20 @@ services:
         volumes:
             - ./Swagger:/Swagger
 
+    filebeat:
+        build: ./Filebeat
+        container_name: xmltools-filebeat
+        user: root
+        volumes:
+            - "./Filebeat/filebeat.docker.yml:/usr/share/filebeat/filebeat.yml:ro"
+            - "/var/lib/docker/containers:/var/lib/docker/containers:ro"
+            - "/var/run/docker.sock:/var/run/docker.sock:ro"
+        environment:
+            - ENV_TYPE
+        command:
+            - "-e"
+            - "--strict.perms=false"
+
 networks:
     default:
         name: tools_network