diff --git a/navidrome/compose.yaml b/navidrome/compose.yaml
index ad556bb..4b468e1 100755
--- a/navidrome/compose.yaml
+++ b/navidrome/compose.yaml
@@ -25,4 +25,10 @@ services:
       - /media/Musik:/music:ro
       - ./data:/data
       - ./navidrome.toml:/config/navidrome.toml
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:4533/ping"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
 networks: {}
diff --git a/nextcloud/compose.yaml b/nextcloud/compose.yaml
index 9d986a9..43af016 100755
--- a/nextcloud/compose.yaml
+++ b/nextcloud/compose.yaml
@@ -7,10 +7,10 @@ services:
     hostname: https://nextcloud-app.hanold.online
     volumes:
       - ./nextcloud-data:/var/www/html
-#      - /media/webdav/Dokumente:/mnt/WebDav_Dokumente
+      #      - /media/webdav/Dokumente:/mnt/WebDav_Dokumente
       - /media/Daten/Nextcloud:/mnt/Heimserver
     tmpfs:
-      - /tmp:size=1G  # Ensures /tmp writable, clears restarts
+      - /tmp:size=1G # Ensures /tmp writable, clears restarts
     init: true
     ports:
       - 9180:80
@@ -32,6 +32,12 @@ services:
       resources:
         limits:
           memory: 4G
+    healthcheck:
+      test: ["CMD-SHELL", "runuser -u www-data -- php /var/www/html/occ status | grep -e 'installed: true' -e 'maintenance: false' -e 'needsDbUpgrade: false' | wc -l | grep -q 3 || exit 1"]
+      interval: 60s
+      timeout: 10s
+      retries: 5
+      start_period: 20s
 
   collabora:
     image: collabora/code:latest
@@ -44,9 +50,19 @@ services:
       - MKNOD
     environment:
       - domain=nextcloud-app\.hanold\.online
-#      - username=admin  # Or blank
-#      - password=yourpass
-      - extra_params=--o:ssl.enable=false  # If internal; true + certs for prod
+      #      - username=admin  # Or blank
+      #      - password=yourpass
+      - extra_params=--o:ssl.enable=false # If internal; true + certs for prod
     ports:
       - 9380:9980
+    healthcheck:
+      test:
+        - CMD
+        - curl
+        - -f
+        - http://192.168.178.183:9380
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 60s
 networks: {}
diff --git a/nginx/docker-compose.yml b/nginx/docker-compose.yml
index 533e423..6be1ca4 100755
--- a/nginx/docker-compose.yml
+++ b/nginx/docker-compose.yml
@@ -4,6 +4,7 @@ services:
     container_name: nginx
     labels:
       - wud.watch=true
+      - com.hanold.environment=production
     deploy:
       resources:
         limits:
@@ -17,4 +18,10 @@ services:
       - ./data:/data
       - ./letsencrypt:/etc/letsencrypt
       - ./snippets:/snippets
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost/ || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 5s
 networks: {}