diff --git a/roles/docker-deployments/tasks/main.yaml b/roles/docker-deployments/tasks/main.yaml
index ad2939e..00f57c6 100644
--- a/roles/docker-deployments/tasks/main.yaml
+++ b/roles/docker-deployments/tasks/main.yaml
@@ -258,6 +258,7 @@
     - gitea
     - gitea-runner
     - atlantis-status
+    - logstash
 
 - name: OAuth2Proxy directories
   file:
diff --git a/roles/docker-deployments/templates/gitea-runner.yaml b/roles/docker-deployments/templates/gitea-runner.yaml
index 5720759..f7b0e2f 100644
--- a/roles/docker-deployments/templates/gitea-runner.yaml
+++ b/roles/docker-deployments/templates/gitea-runner.yaml
@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   runner:
     image: gitea/act_runner:nightly
diff --git a/roles/docker-deployments/templates/logstash.conf b/roles/docker-deployments/templates/logstash.conf
index 64bc497..f117b26 100644
--- a/roles/docker-deployments/templates/logstash.conf
+++ b/roles/docker-deployments/templates/logstash.conf
@@ -5,11 +5,29 @@ input {
 }
 
 output {
-  opensearch {
-    hosts => ["https://atlantishq.de:9200"]
-    index => "filebeat-dev-%{+YYYY.MM.dd}"
-    ssl_certificate_verification => false
-    user => "logstash"
-    password => "{{ opensearch_logstash_password }}"
+  if [fields][container_logs] {
+    opensearch {
+      hosts => ["https://atlantishq.de:9200"]
+      index => "filebeat-containers-dev-%{+YYYY.MM.dd}"
+      ssl_certificate_verification => false
+      user => "logstash"
+      password => "HISTORY_PURGED_SECRET"
+    }
+  }else if [fields][syslog] {
+    opensearch {
+      hosts => ["https://atlantishq.de:9200"]
+      index => "filebeat-syslog-dev-%{+YYYY.MM.dd}"
+      ssl_certificate_verification => false
+      user => "logstash"
+      password => "HISTORY_PURGED_SECRET"
+    }
+  }else{
+    opensearch {
+      hosts => ["https://atlantishq.de:9200"]
+      index => "filebeat-dev-%{+YYYY.MM.dd}"
+      ssl_certificate_verification => false
+      user => "logstash"
+      password => "HISTORY_PURGED_SECRET"
+    }
   }
 }
diff --git a/roles/docker-deployments/templates/logstash.yaml b/roles/docker-deployments/templates/logstash.yaml
index 324d54e..eb388e6 100644
--- a/roles/docker-deployments/templates/logstash.yaml
+++ b/roles/docker-deployments/templates/logstash.yaml
@@ -1,6 +1,7 @@
 version: "3.8"
 services:
   logstash:
+    restart: always
     image: opensearchproject/logstash-oss-with-opensearch-output-plugin:8.9.0
     container_name: logstash
     ports:
diff --git a/roles/opensearch/tasks/opensearch.yaml b/roles/opensearch/tasks/opensearch.yaml
index 05820f3..dd903c6 100644
--- a/roles/opensearch/tasks/opensearch.yaml
+++ b/roles/opensearch/tasks/opensearch.yaml
@@ -32,3 +32,12 @@
   loop: "{{ opensearch_data_nodes }}"
   loop_control:
     loop_var: node_name
+
+- name: Deploy compose templates
+  community.docker.docker_compose_v2:
+    remove_orphans: true
+    project_src: "/opt/{{ item }}/"
+    pull: "missing"
+    files:
+      - "{{ item }}.yaml"
+  with_items: "{{ opensearch_data_nodes + opensearch_dashboards }}"
diff --git a/roles/opensearch/templates/opensearch-dashboard.yaml b/roles/opensearch/templates/opensearch-dashboard.yaml
index 0e12e75..06fd87c 100644
--- a/roles/opensearch/templates/opensearch-dashboard.yaml
+++ b/roles/opensearch/templates/opensearch-dashboard.yaml
@@ -1,6 +1,6 @@
-version: '3'
 services:
   opensearch-dashboards:
+    restart: always
     image: opensearchproject/opensearch-dashboards:latest # Make sure the version of opensearch-dashboards matches the version of opensearch installed on other nodes
     container_name: opensearch-dashboards
     ports:
diff --git a/roles/opensearch/templates/opensearch-data.yaml b/roles/opensearch/templates/opensearch-data.yaml
index 08ef064..6a682d9 100644
--- a/roles/opensearch/templates/opensearch-data.yaml
+++ b/roles/opensearch/templates/opensearch-data.yaml
@@ -1,6 +1,6 @@
-version: '3'
 services:
   opensearch-{{ node_name }}:
+    restart: always
     image: opensearchproject/opensearch:latest
     container_name: {{ node_name }}
     environment: