diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 72a16d0..0a85a77 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -42,8 +42,15 @@ jobs:
 
       - name: Health check
         run: |
-          echo "Waiting for services to start..."
-          sleep 20
+          echo "Waiting for all containers to become healthy..."
+          for i in $(seq 1 30); do
+            STATUS=$(docker inspect --format='{{.State.Health.Status}}' galaxis-po-frontend 2>/dev/null || echo "missing")
+            if [ "$STATUS" = "healthy" ]; then
+              break
+            fi
+            echo "  frontend: $STATUS (attempt $i/30)"
+            sleep 5
+          done
           docker compose --project-name galaxis-po --env-file .env.prod -f docker-compose.prod.yml ps
           docker exec galaxis-po-backend python -c "import urllib.request; urllib.request.urlopen('http://localhost:8000/health')" || { echo "Backend: FAILED"; exit 1; }
           echo "Backend: OK"