diff --git a/Dockerfile b/Dockerfile
index 4794c939..61731706 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,21 +16,16 @@ ADD Pipfile /crc-workflow/
 ADD Pipfile.lock /crc-workflow/
 RUN pipenv install --dev
 
-ENV FLASK_APP=./crc/__init__.py
-RUN echo $FLASK_APP
-
 # include rejoiner code (gets overriden by local changes)
 COPY . /crc-workflow/
 
 # run migrations
-CMD ["pipenv", "run", "flask", "db", "upgrade"]
-CMD ["pipenv", "run", "flask", "load-example-data"]
+ENV FLASK_APP=./crc/__init__.py
+RUN pipenv run flask db upgrade
+RUN pipenv run flask load-example-data
 
 # run webserver by default
-CMD ["pipenv", "run", "python", "/crc-workflow/run.py"]
-
+CMD ["pipenv", "run", "python", "./run.py"]
 
 # expose ports
 EXPOSE 5000
-
-