diff --git a/docker-compose.yml b/docker-compose.yml
index 7a84d1e..516a857 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,6 +15,12 @@ services:
     volumes:
       - /mnt/.ix-apps/app_mounts/nzbget/config:/config
       - /mnt/pool-main/media/downloads:/downloads
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD-SHELL", "curl -f http://127.0.0.1:6789 >/dev/null 2>&1"]
     restart: unless-stopped
     labels:
       - com.centurylinklabs.watchtower.enable=true
@@ -42,6 +48,12 @@ services:
       - /mnt/.ix-apps/app_mounts/jellyfin/config:/config
       - /mnt/pool-main/media/series:/data/tvshows
       - /mnt/pool-main/media/movies:/data/movies
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD-SHELL", "curl -f http://127.0.0.1:8096 >/dev/null 2>&1"]
     restart: unless-stopped
     labels:
       - com.centurylinklabs.watchtower.enable=true
@@ -71,6 +83,12 @@ services:
       - /mnt/.ix-apps/app_mounts/plex/config:/config
       - /mnt/pool-main/media/series:/tv
       - /mnt/pool-main/media/movies:/movies
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD-SHELL", "curl -f http://127.0.0.1:32400 >/dev/null 2>&1"]
     restart: unless-stopped
     labels:
       - com.centurylinklabs.watchtower.enable=true
@@ -92,6 +110,12 @@ services:
       - /mnt/.ix-apps/app_mounts/tautulli/config:/config
     ports:
       - 8181:8181
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD-SHELL", "curl -f http://127.0.0.1:8181 >/dev/null 2>&1"]
     restart: unless-stopped
     labels:
       - com.centurylinklabs.watchtower.enable=true
@@ -113,6 +137,12 @@ services:
       - /mnt/.ix-apps/app_mounts/radarr/config:/config
       - /mnt/pool-main/media/movies:/movies #optional
       - /mnt/pool-main/media/downloads:/downloads #optional
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD-SHELL", "curl -f http://127.0.0.1:7878 >/dev/null 2>&1"]
     restart: unless-stopped
     labels:
       - com.centurylinklabs.watchtower.enable=true
@@ -135,6 +165,12 @@ services:
       - /mnt/.ix-apps/app_mounts/sonarr/config:/config
       - /mnt/pool-main/media/series:/tv #optional
       - /mnt/pool-main/media/downloads:/downloads #optional
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD-SHELL", "curl -f http://127.0.0.1:8989 >/dev/null 2>&1"]
     restart: unless-stopped
     labels:
       - com.centurylinklabs.watchtower.enable=true
@@ -155,6 +191,12 @@ services:
       - TZ=Europe/Brussels
     volumes:
       - /mnt/.ix-apps/app_mounts/prowlarr/config:/config
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD-SHELL", "curl -f http://127.0.0.1:9696 >/dev/null 2>&1"]
     restart: unless-stopped
     labels:
       - com.centurylinklabs.watchtower.enable=true
@@ -177,6 +219,12 @@ services:
       - /mnt/.ix-apps/app_mounts/bazarr/config:/config
       - /mnt/pool-main/media/movies:/movies
       - /mnt/pool-main/media/series:/tv
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD-SHELL", "curl -f http://127.0.0.1:6767 >/dev/null 2>&1"]
     restart: unless-stopped
     labels:
       - com.centurylinklabs.watchtower.enable=true
@@ -197,6 +245,12 @@ services:
       - /mnt/.ix-apps/app_mounts/lidarr/config:/config
       - /mnt/pool-main/media/music:/music #optional
       - /mnt/pool-main/media/downloads:/downloads #optional
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD-SHELL", "curl -f http://127.0.0.1:8686 >/dev/null 2>&1"]
     restart: unless-stopped
     labels:
       - com.centurylinklabs.watchtower.enable=true
@@ -215,6 +269,12 @@ services:
       - TZ=Europe/Brussels
     volumes:
       - /mnt/.ix-apps/app_mounts/jellyseerr/config:/app/config
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD-SHELL", "curl -f http://127.0.0.1:5055 >/dev/null 2>&1"]
     restart: unless-stopped
     labels:
       - com.centurylinklabs.watchtower.enable=true
@@ -238,6 +298,12 @@ services:
     volumes:
       - /mnt/.ix-apps/app_mounts/transmission/data:/config
       - /mnt/pool-main/media/downloads:/downloads #optional
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD-SHELL", "curl -f http://127.0.0.1:9091 >/dev/null 2>&1"]
     restart: unless-stopped
     labels:
       - com.centurylinklabs.watchtower.enable=true
@@ -301,6 +367,12 @@ services:
       - OPENVPN_PASSWORD=${VPN_PASSWORD}
       - SERVER_COUNTRIES=Switzerland
       - TZ=Europe/Brussels
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD", "/gluetun/healthcheck.sh"]
     restart: unless-stopped
     labels:
       - com.centurylinklabs.watchtower.enable=true
@@ -320,6 +392,12 @@ services:
       - WATCHTOWER_CLEANUP=true
       - WATCHTOWER_NO_STARTUP_MESSAGE=true
       - WATCHTOWER_LABEL_ENABLE=true
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD-SHELL", "/watchtower --help >/dev/null 2>&1"]
     restart: unless-stopped
 
   ############################
@@ -335,4 +413,10 @@ services:
       - AUTOHEAL_DEFAULT_STOP_TIMEOUT=30
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+    healthcheck:
+      interval: 1m
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      test: ["CMD-SHELL", "ps -C autoheal >/dev/null 2>&1"]
     restart: unless-stopped