diff --git a/compose.authentik.yaml b/compose.authentik.yaml
index d9632f5..a7026eb 100644
--- a/compose.authentik.yaml
+++ b/compose.authentik.yaml
@@ -81,9 +81,3 @@ services:
     depends_on:
       - authentik-postgres
       - authentik-redis
-    healthcheck:
-      test: ["CMD-SHELL", "ps aux | grep '[c]elery' || exit 1"]
-      interval: 30s
-      timeout: 5s
-      retries: 3
-      start_period: 30s
diff --git a/compose.beszel.yaml b/compose.beszel.yaml
index 209f737..cb02a3c 100644
--- a/compose.beszel.yaml
+++ b/compose.beszel.yaml
@@ -11,11 +11,6 @@ services:
     environment:
       USER_CREATION: true
       DISABLE_PASSWORD_AUTH: false
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--spider", "http://localhost:8090"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
 
   beszel-agent:
     image: henrygd/beszel-agent:0.12.6
@@ -31,8 +26,3 @@ services:
       HUB_URL: http://localhost:8090
       TOKEN: ${BESZEL_TOKEN:?}
       KEY: ${BESZEL_KEY:?}
-    healthcheck:
-      test: ["CMD-SHELL", "pidof beszel-agent || exit 1"]
-      interval: 30s
-      timeout: 5s
-      retries: 3
diff --git a/compose.caddy.yaml b/compose.caddy.yaml
index 112815e..e6f5de7 100644
--- a/compose.caddy.yaml
+++ b/compose.caddy.yaml
@@ -26,14 +26,7 @@ services:
     extra_hosts:
       - "host:${HOST_IP}"
     healthcheck:
-      test:
-        [
-          "CMD",
-          "wget",
-          "--no-verbose",
-          "--spider",
-          "http://localhost:2019/metrics",
-        ]
+      test: ["CMD-SHELL", "ps aux | grep 'caddy' || exit 1"]
       interval: 30s
       timeout: 10s
       retries: 3
diff --git a/compose.dns-ad-blocker.yaml b/compose.dns-ad-blocker.yaml
index 81a2cc9..88988aa 100644
--- a/compose.dns-ad-blocker.yaml
+++ b/compose.dns-ad-blocker.yaml
@@ -1,5 +1,6 @@
 services:
   dns-ad-blocker:
+    image: oznu/dns-ad-blocker:latest
     container_name: dns-ad-blocker
     environment:
       - AUTO_UPDATE=1
@@ -9,7 +10,6 @@ services:
       - DNSCRYPT_RESOLVER_ADDR=45.76.35.212
       - DNSCRYPT_PROVIDER_KEY=4C84:FB8C:0511:5DFA:5F97:C5ED:0329:1370:C78A:BCD6:4E15:DD53:AB08:DE72:FB84:4ACA
       - WHITELIST=api.segment.io,www.googleapis.com,analytics.google.com
-    image: oznu/dns-ad-blocker:latest
     ports:
       - 192.168.2.201:53:53/udp
     restart: unless-stopped
@@ -19,7 +19,7 @@ services:
       - /opt/dns-ad-blocker/var/log:/var/log
       - /opt/dns-ad-blocker/dnsmasq.hosts:/etc/dnsmasq.hosts
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:80"]
+      test: ["CMD-SHELL", "nc -z -u localhost 53 || exit 1"]
       interval: 30s
       timeout: 10s
       retries: 3
diff --git a/compose.droppy.yaml b/compose.droppy.yaml
index cb11a41..1d1c32f 100644
--- a/compose.droppy.yaml
+++ b/compose.droppy.yaml
@@ -10,7 +10,10 @@ services:
       - /media/scratch/droppy:/files
     healthcheck:
       test:
-        ["CMD", "wget", "--no-verbose", "--spider", "http://localhost:8989/"]
+        [
+          "CMD-SHELL",
+          "wget --no-verbose --spider http://127.0.0.1:8989/ || exit 1",
+        ]
       interval: 30s
       timeout: 10s
       retries: 3
diff --git a/compose.fluentbit.yaml b/compose.fluentbit.yaml
index e7f5095..bf55deb 100644
--- a/compose.fluentbit.yaml
+++ b/compose.fluentbit.yaml
@@ -1,6 +1,6 @@
 services:
   fluentbit:
-    image: fluent/fluent-bit:4.1.1-amd64
+    image: fluent/fluent-bit:4.2.2-amd64
     container_name: fluentbit
     restart: unless-stopped
     command: fluent-bit --config /fluent-bit.yaml
@@ -21,15 +21,3 @@ services:
       - DATABASE_NAME=${FLUENTBIT_DATABASE_NAME}
     extra_hosts:
       - "host:${HOST_IP}"
-    healthcheck:
-      test:
-        [
-          "CMD",
-          "wget",
-          "--no-verbose",
-          "--spider",
-          "http://localhost:2020/api/v1/health",
-        ]
-      interval: 30s
-      timeout: 10s
-      retries: 3
diff --git a/compose.jellyfin.yaml b/compose.jellyfin.yaml
index e4d0492..7064adf 100644
--- a/compose.jellyfin.yaml
+++ b/compose.jellyfin.yaml
@@ -18,7 +18,7 @@ services:
       - /mnt/yotta/krypton/Shows:/host/srv/shows
       - /mnt/yotta/neon/Music/Albums:/host/srv/music
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8096/health"]
+      test: ["CMD", "curl", "-f", "http://localhost:8097/health"]
       interval: 30s
       timeout: 10s
       retries: 3
diff --git a/compose.jellyseerr.yaml b/compose.jellyseerr.yaml
index ac9d3eb..18f03c8 100644
--- a/compose.jellyseerr.yaml
+++ b/compose.jellyseerr.yaml
@@ -13,7 +13,11 @@ services:
       - "sonarr:${HOST_IP}"
       - "radarr:${HOST_IP}"
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:5055/status"]
+      test:
+        [
+          "CMD-SHELL",
+          "wget --no-verbose --spider http://localhost:5055/status || exit 1",
+        ]
       interval: 30s
       timeout: 10s
       retries: 3
diff --git a/compose.mediamtx.yaml b/compose.mediamtx.yaml
index bbc4bd8..96dff77 100644
--- a/compose.mediamtx.yaml
+++ b/compose.mediamtx.yaml
@@ -3,6 +3,7 @@ services:
     image: bluenviron/mediamtx:1.14.0-ffmpeg
     container_name: mediamtx
     environment:
+      MTX_API: yes
       MTX_RTSPTRANSPORTS: tcp
       MTX_WEBRTCADDITIONALHOSTS: :${HOST_IP}
     ports:
@@ -19,7 +20,11 @@ services:
       - /mnt/yotta/radon/mediamtx:/recordings
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:9997/v3/paths/list"]
+      test:
+        [
+          "CMD-SHELL",
+          "wget -q -O - http://localhost:9997/v3/paths/list || exit 1",
+        ]
       interval: 30s
       timeout: 10s
       retries: 3
diff --git a/compose.mosquitto.yaml b/compose.mosquitto.yaml
index e5b2191..945c00a 100644
--- a/compose.mosquitto.yaml
+++ b/compose.mosquitto.yaml
@@ -13,8 +13,7 @@ services:
     extra_hosts:
       - "host:${HOST_IP}"
     healthcheck:
-      test:
-        ["CMD-SHELL", "mosquitto_sub -t '$SYS/#' -C 1 -i healthcheck || exit 1"]
+      test: ["CMD-SHELL", "nc -z -w 5 localhost 1883 || exit 1"]
       interval: 30s
       timeout: 10s
       retries: 3
diff --git a/compose.photoprism.yaml b/compose.photoprism.yaml
index ee46ffb..8905d75 100644
--- a/compose.photoprism.yaml
+++ b/compose.photoprism.yaml
@@ -56,11 +56,8 @@ services:
     healthcheck:
       test:
         [
-          "CMD",
-          "wget",
-          "--no-verbose",
-          "--spider",
-          "http://localhost:2342/api/v1/status",
+          "CMD-SHELL",
+          "wget -qO- http://localhost:2342/api/v1/status | grep operational || exit 1",
         ]
       interval: 30s
       timeout: 10s
diff --git a/compose.qbittorrent.yaml b/compose.qbittorrent.yaml
index a4ba0a2..7759acd 100644
--- a/compose.qbittorrent.yaml
+++ b/compose.qbittorrent.yaml
@@ -15,7 +15,7 @@ services:
       - /opt/qbittorrent:/config
       - /media/scratch/qbittorrent:/downloads/qbittorrent
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080/"]
+      test: ["CMD", "curl", "-f", "http://localhost:9092/"]
       interval: 30s
       timeout: 10s
       retries: 3
diff --git a/compose.teslamate.yaml b/compose.teslamate.yaml
index 2c677d4..50ac8d7 100644
--- a/compose.teslamate.yaml
+++ b/compose.teslamate.yaml
@@ -23,7 +23,7 @@ services:
     cap_drop:
       - all
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:4000"]
+      test: ["CMD-SHELL", "nc -z -w 1 localhost 4000 || exit 1"]
       interval: 30s
       timeout: 10s
       retries: 3
diff --git a/compose.uptime.yaml b/compose.uptime.yaml
index b310c63..9cfb352 100644
--- a/compose.uptime.yaml
+++ b/compose.uptime.yaml
@@ -14,3 +14,5 @@ services:
       timeout: 10s
       retries: 3
       start_period: 30s
+    extra_hosts:
+      - "host:${HOST_IP}"