diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7fb2d0ba4..a239882f7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -41,3 +41,21 @@ COPY --from=build /etc/orchestrator.conf.json /etc/orchestrator.conf.json
 WORKDIR /usr/local/orchestrator
 ADD docker/entrypoint.sh /entrypoint.sh
 CMD /entrypoint.sh
+
+ENV USER=docker
+ENV UID=1000
+ENV GID=1000
+
+RUN addgroup -g $GID $USER
+RUN adduser \
+    --disabled-password \
+    --gecos "" \
+    --home /usr/local/orchestrator \
+    --ingroup "$USER" \
+    --no-create-home \
+    --uid "$UID" \
+    "$USER"
+
+RUN chown -R docker:docker /usr/local/orchestrator
+
+USER docker