diff --git a/solution/Dockerfile b/solution/Dockerfile
index 3eccf454a6fc374ceb0c2e8764cc85d8f4eb5381..b4221a3f2e692c45685026085f4a8070b3e36343 100755
--- a/solution/Dockerfile
+++ b/solution/Dockerfile
@@ -14,6 +14,9 @@ RUN apt-get update && apt-get upgrade -y && apt-get install \
 ADD requirements.txt /app/requirements.txt
 RUN pip install --default-timeout=100 --upgrade pip && pip install -r /app/requirements.txt
 
+RUN addgroup --gid 1001 django && \
+    useradd --uid 1001 --gid 1001 django
+
 # We add the current content of the git repo in the /app directory
 ADD . /app
 WORKDIR /app
@@ -21,4 +24,7 @@ RUN rm -rf .gitlab-ci.yml Dockerfile README.md img
 # We use the CMD command to start the gunicorn daemon
 # when we start the container.
 # Note the $PORT variable, we will need to define it when we start the container
+
+USER django
+
 CMD python manage.py runserver 0.0.0.0:$PORT