diff --git a/Dockerfile.external b/Dockerfile.external
index 2317354d..33c53848 100644
--- a/Dockerfile.external
+++ b/Dockerfile.external
@@ -26,7 +26,8 @@ EXPOSE 8080
 # Prepare a non-root user
 ARG UID=100
 ARG GID=65534
-RUN adduser --system --uid ${UID} --gid ${GID} worker
+RUN adduser --group --gid ${GID} worker
+RUN adduser --system --ingroup worker --uid ${UID} --home /home/worker worker
 WORKDIR /home/worker/app
 
 RUN mkdir local_data; chown worker local_data
diff --git a/Dockerfile.local b/Dockerfile.local
index cd3d5141..3bbe0de8 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -37,7 +37,7 @@ EXPOSE 8080
 ARG UID=100
 ARG GID=65534
 RUN adduser --group --gid ${GID} worker
-RUN adduser --system --ingroup worker --uid ${UID} worker
+RUN adduser --system --ingroup worker --uid ${UID} --home /home/worker worker
 WORKDIR /home/worker/app
 
 RUN mkdir local_data; chown worker local_data