diff --git a/Dockerfile.external b/Dockerfile.external
index 3e2530e..f3afac4 100644
--- a/Dockerfile.external
+++ b/Dockerfile.external
@@ -23,7 +23,9 @@ ENV PORT=8080
 EXPOSE 8080
 
 # Prepare a non-root user
-RUN adduser --system worker
+ARG UID=100
+ARG GID=65534
+RUN adduser --system --uid ${UID} --gid ${GID} worker
 WORKDIR /home/worker/app
 
 RUN mkdir local_data; chown worker local_data
diff --git a/Dockerfile.local b/Dockerfile.local
index 980a9b0..8c5c073 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -33,8 +33,10 @@ ENV PORT=8080
 EXPOSE 8080
 
 # Prepare a non-root user
-RUN adduser --group worker
-RUN adduser --system --ingroup worker worker
+ARG UID=100
+ARG GID=65534
+RUN adduser --group --gid ${GID} worker
+RUN adduser --system --ingroup worker --uid ${UID} worker
 WORKDIR /home/worker/app
 
 RUN mkdir local_data; chown worker local_data