diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile
index abfd5c1d4..1ff481459 100644
--- a/{{cookiecutter.repo_name}}/Dockerfile
+++ b/{{cookiecutter.repo_name}}/Dockerfile
@@ -25,13 +25,10 @@ RUN \
   npm install -g npm && \
   printf '\n# Node.js\nexport PATH="node_modules/.bin:$PATH"' >> /root/.bashrc
 
-RUN groupadd -r django && useradd -r -g django django
-ADD . /app
-
 RUN npm install -g grunt grunt-cli
 
-RUN cd /app && npm install
-RUN cd /app && grunt build
+RUN groupadd -r django && useradd -r -g django django
+ADD . /app
 
 RUN chown -R django /app
 
@@ -42,5 +39,6 @@ RUN chmod +x /entrypoint.sh && chown django /entrypoint.sh
 RUN chmod +x /gunicorn.sh && chown django /gunicorn.sh
 
 WORKDIR /app
+USER django
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/{{cookiecutter.repo_name}}/compose/django/entrypoint.sh b/{{cookiecutter.repo_name}}/compose/django/entrypoint.sh
index 9c5073dcf..afeda8f00 100644
--- a/{{cookiecutter.repo_name}}/compose/django/entrypoint.sh
+++ b/{{cookiecutter.repo_name}}/compose/django/entrypoint.sh
@@ -15,4 +15,8 @@ export DATABASE_URL=postgres://$POSTGRES_ENV_POSTGRES_USER:$POSTGRES_ENV_POSTGRE
 {% if cookiecutter.use_celery == 'y' %}
 export CELERY_BROKER_URL=$DJANGO_CACHE_URL
 {% endif %}
+
+npm install
+grunt build
+
 exec "$@"