diff --git a/bin/start-ds.sh b/bin/start-ds.sh
index 9485820209750ad155752a35f09186658a78e3c2..b9b958ecd85a9eed927c99862d3e675fe166c6f9 100755
--- a/bin/start-ds.sh
+++ b/bin/start-ds.sh
@@ -35,7 +35,7 @@ else
   mkdir -p /tmp/tangostationcontrol
   python3 setup.py build --build-base /tmp/tangostationcontrol egg_info --egg-base /tmp/tangostationcontrol bdist_wheel --dist-dir /tmp/tangostationcontrol || exit 1
   # shellcheck disable=SC2012
-  sudo pip install "$(ls -Art /tmp/tangostationcontrol/*.whl | tail -n 1)"
+  pip install "$(ls -Art /tmp/tangostationcontrol/*.whl | tail -n 1)"
 fi
 
 # Return to the stored the directory, this preserves the working_dir argument in
diff --git a/docker-compose/jupyter/Dockerfile b/docker-compose/jupyter/Dockerfile
index cc1652e4a45bc14805632ec1d4056beaab1fd34c..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
-ENV HOME=/home/user
-RUN sudo mkdir -p ${HOME}
+# 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 ./