diff --git a/docker-compose.yml b/docker-compose.yml
index 119fbd75..6599d960 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -90,6 +90,9 @@ services:
       dockerfile: docker/Dockerfile
     command:
       [
+        "/bin/bash",
+        "-c",
+        "./wait-for-it.sh &&",
         "celery",
         "-A",
         "config",
@@ -104,6 +107,9 @@ services:
     depends_on:
       - db
       - redis
+    volumes:
+      - .:/code
+      - ./wait-for-it.sh:/wait-for-it.sh
 
   celery-beat:
     build:
diff --git a/wait-for-it.sh b/wait-for-it.sh
new file mode 100755
index 00000000..feae3eff
--- /dev/null
+++ b/wait-for-it.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Wait for the other container to be ready
+while ! nc -z web 8000; do
+  sleep 1
+done