diff --git a/apps/cloudflared/docker-compose.yml b/apps/cloudflared/docker-compose.yml
index 554aaa5..6fa050c 100644
--- a/apps/cloudflared/docker-compose.yml
+++ b/apps/cloudflared/docker-compose.yml
@@ -3,13 +3,19 @@ x-vault-env: &vault-env
 services:
   cloudflared:
     image: cloudflare/cloudflared
-    command: tunnel --no-autoupdate run
+    command: tunnel --no-autoupdate --metrics 0.0.0.0:20241 run
     environment: *vault-env
     networks:
       - traefik
     security_opt:
       - no-new-privileges:true
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "cloudflared", "tunnel", "--metrics", "0.0.0.0:20241", "ready"]
+      start_period: 30s
+      interval: 30s
+      timeout: 5s
+      retries: 5
 networks:
   traefik:
     external: true
diff --git a/apps/rybbit/docker-compose.yml b/apps/rybbit/docker-compose.yml
index b3fcb80..c18c596 100644
--- a/apps/rybbit/docker-compose.yml
+++ b/apps/rybbit/docker-compose.yml
@@ -38,6 +38,12 @@ services:
       NEXT_PUBLIC_DISABLE_SIGNUP: ${DISABLE_SIGNUP:-false}
     depends_on:
       - backend
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:3002/"]
+      start_period: 30s
+      interval: 30s
+      timeout: 5s
+      retries: 5
   backend:
     image: ghcr.io/rybbit-io/rybbit-backend
     extends: