diff --git a/compose.ci.yml b/compose.ci.yml
index 5fac48372..3ef2f4379 100644
--- a/compose.ci.yml
+++ b/compose.ci.yml
@@ -1,8 +1,4 @@
 services:
-  certbot:
-    environment:
-      - SELF_SIGNED=true
-
   php:
     build:
       target: gally_php_dev
diff --git a/compose.int.yml b/compose.int.yml
index a401bbb38..725df6d7c 100644
--- a/compose.int.yml
+++ b/compose.int.yml
@@ -1,9 +1,5 @@
 services:
   
-  certbot:
-    environment:
-      - SELF_SIGNED=true
-
   router:
     build:
       context: ./docker/router
diff --git a/compose.override.yaml b/compose.override.yaml
index f2b6fc641..884bf60e7 100644
--- a/compose.override.yaml
+++ b/compose.override.yaml
@@ -1,10 +1,6 @@
 # Development environment override
 services:
   
-  certbot: 
-    environment:
-      - SELF_SIGNED=true
-  
   router:
     volumes:
       - ./api/public:/app/public
diff --git a/compose.yml b/compose.yml
index 08b059aec..d6c5e23a7 100644
--- a/compose.yml
+++ b/compose.yml
@@ -9,8 +9,12 @@ services:
       - ./docker/certbot/certs:/etc/nginx/certs
       - ./docker/certbot/www:/var/www/certbot
     depends_on:
-      - varnish
+      varnish: 
+        condition: service_started
+      certbot:
+          condition: service_healthy
     environment:
+      - SELF_SIGNED=true
       - SERVER_NAME=${SERVER_NAME:-gally.localhost}
       - API_SERVER_NAME=${API_SERVER_NAME:-api.gally.localhost}
       - BACKEND_UPSTREAM=varnish:80