diff --git a/resources/chaosknoten/acmedns/docker_compose/compose.yaml.j2 b/resources/chaosknoten/acmedns/docker_compose/compose.yaml.j2
index a1962f0..3fcd8c6 100644
--- a/resources/chaosknoten/acmedns/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/acmedns/docker_compose/compose.yaml.j2
@@ -19,4 +19,5 @@ services:
       - 8080:80
     volumes:
       - ./configs/acmedns.cfg:/etc/acme-dns/config.cfg:ro
-      - ./data/acmedns:/var/lib/acme-dns
\ No newline at end of file
+      - ./data/acmedns:/var/lib/acme-dns
+    restart: unless-stopped
diff --git a/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 b/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2
index a39c08a..8c38500 100644
--- a/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2
@@ -70,7 +70,7 @@ services:
       - loki_data:/var/loki
 
   ntfy-alertmanager-ccchh-critical:
-    image: docker.io/xenrox/ntfy-alertmanager:0.5.0
+    image: docker.io/xenrox/ntfy-alertmanager:1.0.0
     container_name: ntfy-alertmanager-ccchh-critical
     volumes:
       - ./configs/ntfy-alertmanager-ccchh-critical:/etc/ntfy-alertmanager/config
@@ -79,7 +79,7 @@ services:
     restart: unless-stopped
 
   ntfy-alertmanager-fux-critical:
-    image: docker.io/xenrox/ntfy-alertmanager:0.5.0
+    image: docker.io/xenrox/ntfy-alertmanager:1.0.0
     container_name: ntfy-alertmanager-fux-critical
     volumes:
       - ./configs/ntfy-alertmanager-fux-critical:/etc/ntfy-alertmanager/config
@@ -88,7 +88,7 @@ services:
     restart: unless-stopped
 
   ntfy-alertmanager-ccchh:
-    image: docker.io/xenrox/ntfy-alertmanager:0.5.0
+    image: docker.io/xenrox/ntfy-alertmanager:1.0.0
     container_name: ntfy-alertmanager-ccchh
     volumes:
       - ./configs/ntfy-alertmanager-ccchh:/etc/ntfy-alertmanager/config
@@ -97,7 +97,7 @@ services:
     restart: unless-stopped
 
   ntfy-alertmanager-fux:
-    image: docker.io/xenrox/ntfy-alertmanager:0.5.0
+    image: docker.io/xenrox/ntfy-alertmanager:1.0.0
     container_name: ntfy-alertmanager-fux
     volumes:
       - ./configs/ntfy-alertmanager-fux:/etc/ntfy-alertmanager/config
diff --git a/resources/chaosknoten/pad/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pad/docker_compose/compose.yaml.j2
index be48024..db60eb9 100644
--- a/resources/chaosknoten/pad/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/pad/docker_compose/compose.yaml.j2
@@ -59,6 +59,7 @@ 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 8257b17..bb4127f 100644
--- a/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2
@@ -18,6 +18,7 @@ services:
       timeout: 5s
       start_period: 30s
       retries: 5
+    restart: unless-stopped
 
   web:
     image: git.hamburg.ccc.de/ccchh/sunders/web:latest
@@ -33,6 +34,7 @@ services:
       IMPRESSUM_URL: https://hamburg.ccc.de/imprint/
     ports:
       - "8080:80"
+    restart: unless-stopped
     depends_on:
       data_handler:
         condition: service_started
@@ -48,6 +50,7 @@ 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 bd5e4da..58abefa 100644
--- a/resources/external/status/docker_compose/compose.yaml.j2
+++ b/resources/external/status/docker_compose/compose.yaml.j2
@@ -5,6 +5,7 @@
 services:
   database:
     image: docker.io/library/postgres:18.3
+    restart: always
     volumes:
       - ./database:/var/lib/postgresql
     environment: