diff --git a/install/config/crowdsec/docker-compose.yml b/install/config/crowdsec/docker-compose.yml
index 20c69387..28470d14 100644
--- a/install/config/crowdsec/docker-compose.yml
+++ b/install/config/crowdsec/docker-compose.yml
@@ -9,6 +9,9 @@ services:
       PARSERS: crowdsecurity/whitelists
       ENROLL_TAGS: docker
     healthcheck:
+      interval: 10s
+      retries: 15
+      timeout: 10s
       test: ["CMD", "cscli", "capi", "status"]
     labels:
       - "traefik.enable=false" # Disable traefik for crowdsec
diff --git a/install/config/docker-compose.yml b/install/config/docker-compose.yml
index 496b0138..1cccffa3 100644
--- a/install/config/docker-compose.yml
+++ b/install/config/docker-compose.yml
@@ -48,6 +48,10 @@ services:
     depends_on:
       pangolin:
         condition: service_healthy
+{{if .DoCrowdsecInstall}}
+      crowdsec:
+        condition: service_healthy
+{{end}}
     command:
       - --configFile=/etc/traefik/traefik_config.yml
     volumes: