diff --git a/docker-compose.yml b/docker-compose.yml
index a8083c5..aad16d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,7 +39,7 @@ services:
   mautrix-whatsapp:
     hostname: whatsapp
     image: dock.mau.dev/mautrix/whatsapp
-    restart: unless-stopped
+    restart: no
     volumes:
       - ./config/mautrix-whatsapp:/data
       - /etc/localtime:/etc/localtime:ro
@@ -47,28 +47,46 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "test -f /data/config.yaml -a -f /data/registration.yaml"]
+      interval: 30s
+      timeout: 10s
+      retries: 1
+      start_period: 5s
 
   mautrix-telegram:
     hostname: telegram
     image: dock.mau.dev/mautrix/telegram
-    restart: unless-stopped
+    restart: no
     volumes:
       - ./config/mautrix-telegram:/data
       - /etc/localtime:/etc/localtime:ro
     depends_on:
       postgres:
         condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "test -f /data/config.yaml -a -f /data/registration.yaml"]
+      interval: 30s
+      timeout: 10s
+      retries: 1
+      start_period: 5s
 
   mautrix-discord:
     hostname: discord
     image: dock.mau.dev/mautrix/discord
-    restart: unless-stopped
+    restart: no
     volumes:
       - ./config/mautrix-discord:/data
       - /etc/localtime:/etc/localtime:ro
     depends_on:
       postgres:
         condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "test -f /data/config.yaml -a -f /data/registration.yaml"]
+      interval: 30s
+      timeout: 10s
+      retries: 1
+      start_period: 5s
 
   cleanmedia:
     hostname: cleanmedia