diff --git a/Dockerfile b/Dockerfile
index b5eea22d..38c5f20c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,7 +33,6 @@ WORKDIR /webodm/nodeodm/external/node-OpenDroneMap
 RUN npm install
 
 WORKDIR /webodm
-RUN npm install -g webpack
-RUN npm install
+RUN npm install -g webpack && npm install && webpack && python manage.py collectstatic --noinput
 
 VOLUME /webodm/app/media
diff --git a/README.md b/README.md
index 5a946eb7..b7b03690 100644
--- a/README.md
+++ b/README.md
@@ -196,6 +196,7 @@ pip install -r requirements.txt
 sudo npm install -g webpack
 npm install
 webpack
+python manage.py collectstatic --noinput
 chmod +x start.sh && ./start.sh --no-gunicorn
 ```
 
diff --git a/start.sh b/start.sh
index 64425455..84630377 100755
--- a/start.sh
+++ b/start.sh
@@ -49,18 +49,11 @@ if [ "$1" = "--setup-devenv" ] || [ "$2" = "--setup-devenv" ]; then
 
     echo Setup webpack watch...
     webpack --watch &
-else
-    # Normal startup
-    echo Building asssets...
-    webpack
 fi
 
 echo Running migrations
 python manage.py migrate
 
-echo Collecting static assets
-python manage.py collectstatic --noinput
-
 if [[ "$1" = "--create-default-pnode" ]]; then
    echo "from nodeodm.models import ProcessingNode; ProcessingNode.objects.update_or_create(hostname='node-odm-1', defaults={'hostname': 'node-odm-1', 'port': 3000})" | python manage.py shell
 fi