diff --git a/Dockerfile b/Dockerfile
index 28094b21b..3c9a13e4c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,18 +14,13 @@ ENV USER ${NB_USER}
 ENV NB_UID ${NB_UID}
 ENV HOME /home/${NB_USER}
 
-RUN adduser --disabled-password \
-    --gecos "Default user" \
-    --uid ${NB_UID} \
-    ${NB_USER}
-
-USER root
 RUN chown -R ${NB_UID} ${HOME}
 RUN chown -R ${NB_UID} /opt/openfpga
 USER ${NB_USER}
 
 ENV PATH $PATH:/home/${NB_USER}/.local/bin
 
+RUN python3 -m pip install --upgrade pip
 RUN python3 -m pip install --user --no-cache-dir notebook
 RUN python3 -m pip install --user --no-cache-dir jupyterlab
 RUN python3 -m pip install --user --no-cache-dir jupyterhub
@@ -36,6 +31,7 @@ RUN npm install @jupyterlab/server-proxy
 RUN jupyter serverextension enable --py jupyter_server_proxy
 RUN jupyter labextension install @jupyterlab/server-proxy
 RUN jupyter lab build
+WORKDIR /opt/openfpga/
 RUN git reset --hard HEAD
 
 # Set up terminal