diff --git a/Dockerfile b/Dockerfile
index d6f1093d16879a557ae8e6db38fa0335949eb1ce..8634bcabe3fdee9cf299974d995378b851a65a31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,11 @@ RUN pip install -r requirements/base.txt -r requirements/production.txt
 
 COPY . .
 
-RUN useradd app
-RUN chown -R app /app
+RUN bash -c 'adduser --disabled-login --quiet --gecos app app &&  \
+             chmod -R o+r /app/ && \
+             mkdir /app/media_files && \
+             chown -R app:app /app/media_files && \
+             chmod o+x /app/run.sh'
 USER app
 
 # TODO HACK!