diff --git a/.github/workflows/robot.yml b/.github/workflows/robot.yml
index f4ccdb28..2325197a 100644
--- a/.github/workflows/robot.yml
+++ b/.github/workflows/robot.yml
@@ -30,12 +30,7 @@ jobs:
 
       - name: Start the service
         run: |
-          docker-compose up -d
-
-      - name: Perform healthchecks
-        run: |
-          docker-compose ps -a
-          wget --retry-connrefused --retry-on-http-error=502 http://localhost:8901 #/api/healthcheck
+          docker-compose up -d --wait
 
       - name: Run robot tests
         run: |
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 3d6abe5b..08443631 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -40,7 +40,8 @@ services:
     build: ./scanner
     restart: on-failure
     depends_on:
-      - back
+      back:
+        condition: service_healthy
     env_file:
       - ./.env
     environment:
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 8b52cd46..8470ace5 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -24,7 +24,8 @@ services:
     image: zoriya/kyoo_scanner:edge
     restart: on-failure
     depends_on:
-      - back
+      back:
+        condition: service_healthy
     env_file:
       - ./.env
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index 64c9fd77..7060cdbe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,7 +24,8 @@ services:
     build: ./scanner
     restart: on-failure
     depends_on:
-      - back
+      back:
+        condition: service_healthy
     env_file:
       - ./.env
     environment: