diff --git a/Dockerfile b/Dockerfile
index c8b70c628a3b662ca7a44de495f6decc47e3be28..bee651745b7bd86b3ddfc22e11b154b1b7a8b352 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,7 @@ WORKDIR /app
 EXPOSE 5000
 
 # First, copy and install only the requirements...
-RUN useradd -ms /bin/bash python
-USER python
+RUN useradd -ms /bin/bash python && chown -R python:python /app
 RUN pip install --upgrade pip setuptools
 RUN pip install pipenv
 COPY Pipfile.lock .
@@ -15,7 +14,7 @@ RUN pip uninstall --yes pipenv
 RUN pip install -r requirements.txt
 # ... then the rest of the application. This allows the installation stage to be cached most of the time
 # (so we don't have reinstall of all dependencies every time the container is rebuilt)
-COPY . .
+COPY --chown=python:python . .
 
 FROM base AS dev
 ENV SERVER_TYPE=flask