diff --git a/docker-compose/jupyter/Dockerfile b/docker-compose/jupyter/Dockerfile
index 0626e0f067bfe2bf52c7ac4ebf0a94f0acda5699..4017b5c8e3faaf21690d83f35b2e994fbfd31e15 100644
--- a/docker-compose/jupyter/Dockerfile
+++ b/docker-compose/jupyter/Dockerfile
@@ -5,9 +5,8 @@ FROM ${SOURCE_IMAGE}
 # that are needed for temporary storage the proper owner and access rights.
 ARG CONTAINER_EXECUTION_UID=1000
 
-# Create homedir
-RUN sudo adduser --uid ${CONTAINER_EXECUTION_UID} --gid ${CONTAINER_EXECUTION_UID} --home ${HOME} user || exit 0
-RUN sudo echo "PATH=${HOME}/.local/bin:\$PATH" >> ~/.bashrc
+# Create new user with uid but only if uid not used
+RUN sudo adduser --disabled-password --system --uid ${CONTAINER_EXECUTION_UID} --no-create-home --home ${HOME} user || exit 0
 RUN sudo chown ${CONTAINER_EXECUTION_UID} -R ${HOME}
 
 COPY requirements.txt ./