diff --git a/Dockerfile.api_server b/Dockerfile.api_server
index fad5e0131..b2ddc8a9f 100755
--- a/Dockerfile.api_server
+++ b/Dockerfile.api_server
@@ -24,7 +24,10 @@ RUN apt-get update \
  && apt-get install -y --no-install-recommends sudo python3 python3-pkg-resources curl libmariadbclient-dev-compat \
  && rm -rf /var/lib/apt/lists/
 
-RUN useradd --home /home/server --shell /bin/bash server
+ARG USER_ID=1000
+RUN userdel -r ubuntu
+RUN useradd -u ${USER_ID} --home /home/server --shell /bin/bash server
+
 COPY --chown=server:server --from=build-packages /root/.local /home/server/.local
 RUN mkdir -p /var/log/oasis /shared-fs && chmod 777 -R /var/log/oasis
 
diff --git a/Dockerfile.model_worker b/Dockerfile.model_worker
index 21069ace8..cbbbc5a1c 100755
--- a/Dockerfile.model_worker
+++ b/Dockerfile.model_worker
@@ -34,7 +34,9 @@ RUN apt-get update \
  && rm -rf /var/lib/apt/lists/*
 
 # Copy built python packages
-RUN useradd  --home /home/worker --shell /bin/bash worker
+ARG USER_ID=1000
+RUN userdel -r ubuntu
+RUN useradd -u ${USER_ID} --home /home/worker --shell /bin/bash worker
 COPY --chown=worker:worker --from=build-packages /root/.local /home/worker/.local
 
 # Copy in worker files