diff --git a/tools/docker-images/clp-package/Dockerfile b/tools/docker-images/clp-package/Dockerfile
index 74e9d97907..35a047b5fe 100644
--- a/tools/docker-images/clp-package/Dockerfile
+++ b/tools/docker-images/clp-package/Dockerfile
@@ -12,15 +12,18 @@ RUN ./setup-scripts/install-prebuilt-packages.sh \
 RUN apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-ENV CLP_HOME="/opt/clp"
-ENV PATH="${CLP_HOME}/bin:${PATH}"
-ENV PATH="${CLP_HOME}/sbin:${PATH}"
-ENV PYTHONPATH="${CLP_HOME}/lib/python3/site-packages"
-
-USER 1000:1000
-
-COPY --link ./build/clp-package /opt/clp
-
 # Flatten the image
 FROM scratch
 COPY --link --from=base / /
+
+ARG UID=1000
+ENV CLP_HOME="/opt/clp"
+ENV PATH="${CLP_HOME}/sbin:${CLP_HOME}/bin:${PATH}" \
+    PYTHONPATH="${CLP_HOME}/lib/python3/site-packages" \
+    USER="clp-user"
+
+RUN useradd --uid ${UID} --shell /bin/bash --home-dir ${CLP_HOME} ${USER}
+USER ${USER}
+WORKDIR ${CLP_HOME}
+
+COPY --link --chown=${UID} ./build/clp-package ${CLP_HOME}