diff --git a/Dockerfile b/Dockerfile
index 1b9b77e..3e3c50a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,6 +41,7 @@ ENV PYTHONUNBUFFERED=1 \
     PYTHONPATH=/app \
     DJANGO_SETTINGS_MODULE=bakerydemo.settings.production \
     PORT=8000 \
+    HOME=/app \
     WEB_CONCURRENCY=3 \
     GUNICORN_CMD_ARGS="-c gunicorn-conf.py --max-requests 1200 --access-logfile - --timeout 25"
 
@@ -65,8 +66,8 @@ RUN SECRET_KEY=none django-admin collectstatic --noinput --clear
 # https://devcenter.heroku.com/articles/container-registry-and-runtime#dockerfile-commands-and-runtime
 USER bakerydemo
 
-ENTRYPOINT /app/docker-entrypoint.sh
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
 
 # Run the WSGI server. It reads GUNICORN_CMD_ARGS, PORT and WEB_CONCURRENCY
 # environment variable hence we don't specify a lot options below.
-CMD gunicorn bakerydemo.wsgi:application
+CMD ["gunicorn", "bakerydemo.wsgi:application"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 4cc4dbc..b187272 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,5 +1,4 @@
-#!/bin/sh
-set -e
+#!/bin/sh -e
 
 # Copy SSH private key to file, if set
 # This is used for talking to GitHub over an SSH connection