diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bd213d8..665fad8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -209,6 +209,13 @@ jobs:
         env:
           BROUTER_URL: http://localhost:17777
 
+      - name: Wait for BRouter routing
+        run: |
+          for i in $(seq 1 30); do
+            curl -sf 'http://localhost:17777/brouter?lonlats=13.4,52.5|13.5,52.5&profile=trekking&format=geojson' > /dev/null 2>&1 && break
+            sleep 3
+          done
+
       - name: Push database schema
         run: pnpm db:push
 
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 2a6d7a9..ff29112 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -24,11 +24,11 @@ services:
     volumes:
       - brouter_segments:/data/segments
     healthcheck:
-      test: ["CMD-SHELL", "curl -sf 'http://localhost:17777/brouter?lonlats=13.4,52.5|13.5,52.5&profile=trekking&format=geojson' > /dev/null"]
-      interval: 10s
-      timeout: 10s
-      retries: 18
-      start_period: 30s
+      test: ["CMD-SHELL", "curl -s http://localhost:17777/ > /dev/null 2>&1"]
+      interval: 5s
+      timeout: 5s
+      retries: 30
+      start_period: 10s
 
   prometheus:
     image: prom/prometheus:latest