diff --git a/resources/chaosknoten/acmedns/docker_compose/compose.yaml.j2 b/resources/chaosknoten/acmedns/docker_compose/compose.yaml.j2
index 3fcd8c6..a1962f0 100644
--- a/resources/chaosknoten/acmedns/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/acmedns/docker_compose/compose.yaml.j2
@@ -19,5 +19,4 @@ services:
       - 8080:80
     volumes:
       - ./configs/acmedns.cfg:/etc/acme-dns/config.cfg:ro
-      - ./data/acmedns:/var/lib/acme-dns
-    restart: unless-stopped
+      - ./data/acmedns:/var/lib/acme-dns
\ No newline at end of file
diff --git a/resources/chaosknoten/pad/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pad/docker_compose/compose.yaml.j2
index db60eb9..be48024 100644
--- a/resources/chaosknoten/pad/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/pad/docker_compose/compose.yaml.j2
@@ -59,7 +59,6 @@ services:
       - "SMTP_USERNAME=pad@hamburg.ccc.de"
       - "SMTP_PASSWORD={{ secret__pad_smtp_password }}"
       - "URL=https://pad.hamburg.ccc.de"
-    restart: unless-stopped
     depends_on:
       - database
 
diff --git a/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2 b/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2
index bb4127f..8257b17 100644
--- a/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2
@@ -18,7 +18,6 @@ services:
       timeout: 5s
       start_period: 30s
       retries: 5
-    restart: unless-stopped
 
   web:
     image: git.hamburg.ccc.de/ccchh/sunders/web:latest
@@ -34,7 +33,6 @@ services:
       IMPRESSUM_URL: https://hamburg.ccc.de/imprint/
     ports:
       - "8080:80"
-    restart: unless-stopped
     depends_on:
       data_handler:
         condition: service_started
@@ -50,7 +48,6 @@ services:
       CAMERA_USER_PASSWORD: "{{ secret__sunders_db_camera_password }}"
       CAMERA_SELECT_USER: camera_select
       CAMERA_SELECT_USER_PASSWORD: "{{ secret__sunders_db_camera_select_password }}"
-    restart: unless-stopped
     depends_on:
       db:
         condition: service_healthy
diff --git a/resources/external/status/docker_compose/compose.yaml.j2 b/resources/external/status/docker_compose/compose.yaml.j2
index 58abefa..bd5e4da 100644
--- a/resources/external/status/docker_compose/compose.yaml.j2
+++ b/resources/external/status/docker_compose/compose.yaml.j2
@@ -5,7 +5,6 @@
 services:
   database:
     image: docker.io/library/postgres:18.3
-    restart: always
     volumes:
       - ./database:/var/lib/postgresql
     environment: