diff --git a/Dockerfile b/Dockerfile
index cce2279..ef04fb3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,9 +16,7 @@ RUN pip install -r requirements.txt --no-cache-dir
 COPY . /code/
 
 RUN python manage.py collectstatic --noinput && \
-        python manage.py compilemessages && \
-        python manage.py migrate && \
-        python manage.py loaddata initial
+        python manage.py compilemessages
 
 # Configure nginx
 RUN mkdir /run/nginx
diff --git a/entrypoint.sh b/entrypoint.sh
index 044f92e..0b67ca4 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -2,10 +2,13 @@
 
 crond -l 0
 
+python manage.py migrate
+python manage.py loaddata initial
+
 nginx
 
 if [ "$CORRES2MATH_STAGE" = "prod" ]; then
     gunicorn -b 0.0.0.0:8000 --workers=2 --threads=4 --worker-class=gthread corres2math.wsgi --access-logfile '-' --error-logfile '-';
 else
-    ./manage.py runserver 0.0.0.0:8000;
+    python manage.py runserver 0.0.0.0:8000;
 fi