diff --git a/docker-compose/logstash-loki.yml b/docker-compose/logstash-loki.yml
index cf28a9689691e82539b65c744e94bf591dc2aaff..88bca081b04d216333ee6ce0ec2d857ffab87f97 100644
--- a/docker-compose/logstash-loki.yml
+++ b/docker-compose/logstash-loki.yml
@@ -28,3 +28,4 @@ services:
       - "1514:1514/udp" # logstash syslog input
       - "5959:5959"     # logstash tcp json input
       - "9600:9600"
+    restart: unless-stopped
diff --git a/docker-compose/logstash-loki/logstash/conf.d/30-output.conf b/docker-compose/logstash-loki/logstash/conf.d/30-output.conf
index 06e5fd69229d7b5c02e2d8d7446668abcf62ef49..1886b10217468a3cbdb07764897ca548d5cccbc2 100644
--- a/docker-compose/logstash-loki/logstash/conf.d/30-output.conf
+++ b/docker-compose/logstash-loki/logstash/conf.d/30-output.conf
@@ -1,9 +1,9 @@
 output {
-  elasticsearch {
-    hosts => ["localhost"]
-    manage_template => false
-    index => "logstash-%{+YYYY.MM.dd}"
-  }
+  # elasticsearch {
+  #   hosts => ["localhost"]
+  #   manage_template => false
+  #   index => "logstash-%{+YYYY.MM.dd}"
+  # }
   loki {
     [url => "localhost:3100" | default = none | required=true]
 
diff --git a/docker-compose/loki.yml b/docker-compose/loki.yml
index 4d8e799cdbf013400db547bd4e2947534d20e361..0e5d38bb24ecec28e1a7bab8ebaf9c836a9b6a42 100644
--- a/docker-compose/loki.yml
+++ b/docker-compose/loki.yml
@@ -20,6 +20,7 @@ services:
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
+    restart: unless-stopped
 
   promtail:
     image: grafana/promtail:2.6.0
@@ -34,3 +35,4 @@ services:
     command: -config.file=/etc/promtail/config.yml
     networks:
       - control
+    restart: unless-stopped