diff --git a/docker-compose.yml b/docker-compose.yml
index a348e567..d72f626a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,16 +3,17 @@ services:
 
   base:
     build: .
-    command: bash -c "mbs-upgradedb && mbs-gencert"
+    command: bash -c "mbs-upgradedb && mbs-gencert && touch /etc/module-build-service/.ready"
     volumes:
       - ./:/tmp/module_build_service:z
       - /etc/module-build-service
+      - /tmp/module_build_service/module_build_service.egg-info
 
   fedmsg-relay:
     depends_on:
       - base
     build: .
-    command: fedmsg-relay
+    command: bash -c "while [ ! -f /etc/module-build-service/.ready ] ; do sleep 1 ; done ; fedmsg-relay"
     expose:
       - 2001
       - 2003
@@ -25,7 +26,7 @@ services:
     depends_on:
       - base
     build: .
-    command: fedmsg-hub
+    command: bash -c "while [ ! -f /etc/module-build-service/.ready ] ; do sleep 1 ; done ; fedmsg-hub"
     links:
       - fedmsg-relay
     environment:
@@ -43,7 +44,7 @@ services:
     depends_on:
       - base
     build: .
-    command: mbs-frontend
+    command: bash -c "while [ ! -f /etc/module-build-service/.ready ] ; do sleep 1 ; done ; mbs-frontend"
     ports:
       - "5000:5000"
     links: