diff --git a/compose.yml b/compose.yml
index 5367be1..6492ec4 100644
--- a/compose.yml
+++ b/compose.yml
@@ -34,6 +34,9 @@ services:
   app:
     image: ghcr.io/goauthentik/server:2023.8.5
     command: server
+    depends_on:
+      - db
+      - redis
     secrets:
       - db_password
       - admin_pass
@@ -79,6 +82,9 @@ services:
   worker:
     image: ghcr.io/goauthentik/server:2023.8.5
     command: worker
+    depends_on:
+      - db
+      - redis
     secrets:
       - db_password
       - admin_pass
@@ -144,7 +150,7 @@ services:
     networks:
       - internal
     healthcheck:
-      test: ["CMD", "redis-cli","ping"]
+      test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
       interval: 30s
       timeout: 10s
       retries: 10