diff --git a/docker/Dockerfile b/docker/Dockerfile
index 81b374b..267923c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,6 +14,7 @@ RUN python3 -m pip install -r /usr/src/app/requirements.txt
 EXPOSE 8000
 
 WORKDIR /usr/src/app/src/
+RUN ../docker/scripts/wait-for-it.sh db:5432
 RUN python3 manage.py migrate
 RUN python3 manage.py migrate interface
 CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 4b87e6e..81785ac 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -14,6 +14,7 @@ services:
     volumes:
       - "${LOCAL_BOOK_DIR}:/usr/src/app/Books"
       - "./cron/root:/etc/crontabs/root"
+      - "./scripts/wait-for-it.sh:/usr/src/app/src/"
     ports:
       - "${PORT}:8000"
     links: