diff --git a/blueprints/rybbit/docker-compose.yml b/blueprints/rybbit/docker-compose.yml
index 2e1fdefe..a657ebc5 100644
--- a/blueprints/rybbit/docker-compose.yml
+++ b/blueprints/rybbit/docker-compose.yml
@@ -36,14 +36,14 @@ services:
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     volumes:
       - postgres_data:/var/lib/postgresql/data
-    restart: unless-stopped
-    networks:
-      - internal
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 30s
       timeout: 10s
       retries: 3
+    restart: unless-stopped
+    networks:
+      - internal
 
   rybbit_backend:
     image: ghcr.io/rybbit-io/rybbit-backend:latest
@@ -66,6 +66,12 @@ services:
         condition: service_healthy
       rybbit_postgres:
         condition: service_started
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:3001/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 10s
     restart: unless-stopped
     networks:
       - internal
@@ -86,13 +92,10 @@ services:
 
   rybbit_caddy:
     image: caddy:2-alpine
-    networks:
-      - web
     volumes:
       - ../files/Caddyfile:/etc/caddy/Caddyfile:ro
     environment:
       - BASE_URL=":80"
-    restart: unless-stopped
     healthcheck:
       test:
         [
@@ -106,6 +109,9 @@ services:
       timeout: 10s
       retries: 3
       start_period: 10s
+    restart: unless-stopped
+    networks:
+      - web
 
 volumes:
   clickhouse_data: