diff --git a/compose.yml b/compose.yml
index 072a507e0..06f0a7a73 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,12 +3,13 @@ networks:
   web:
     external: true
 
-x-django: &django
-  depends_on:
-    postgres:
-      condition: service_healthy
-    redis:
-      condition: service_healthy
+x-django-depends-on: &django-depends-on
+  postgres:
+    condition: service_healthy
+  redis:
+    condition: service_healthy
+
+x-dns: &dns
   dns: 172.17.0.1
   dns_search: funkwhale.test
 
@@ -22,13 +23,19 @@ services:
     extends:
       file: ./compose/app.django.yml
       service: api
-    <<: *django
+    depends_on:
+      <<: *django-depends-on
+      app:
+        condition: service_healthy
+    <<: *dns
 
   worker:
     extends:
       file: ./compose/app.django.yml
       service: worker
-    <<: *django
+    depends_on:
+      <<: *django-depends-on
+    <<: *dns
 
   web:
     extends: