diff --git a/playbooks/templates/chaosknoten/configs/engelsystem/compose.yaml.j2 b/playbooks/templates/chaosknoten/configs/engelsystem/compose.yaml.j2
index 00ea3a0..823abd9 100644
--- a/playbooks/templates/chaosknoten/configs/engelsystem/compose.yaml.j2
+++ b/playbooks/templates/chaosknoten/configs/engelsystem/compose.yaml.j2
@@ -3,6 +3,7 @@ version: "3.6"
 services:
   es_server:
     image: es_server
+    restart: unless-stopped
     build:
       context: /home/chaos/engelsystem
       dockerfile: /home/chaos/engelsystem/docker/Dockerfile
@@ -32,6 +33,7 @@ services:
       - es_database
   es_database:
     image: mariadb:10.2
+    restart: unless-stopped
     environment:
       MYSQL_DATABASE: engelsystem
       MYSQL_USER: engelsystem