diff --git a/.github/workflows/install_dependencies_run.sh b/.github/workflows/install_dependencies_run.sh
index 4c022ee15..f2342af44 100644
--- a/.github/workflows/install_dependencies_run.sh
+++ b/.github/workflows/install_dependencies_run.sh
@@ -1,4 +1,4 @@
 apt-get install --no-install-recommends -y \
 libdatetime-perl libc6 libffi6 libgcc1 libreadline7 libstdc++6 \
 libtcl8.6 python3.8 python3-pip zlib1g libbz2-1.0 \
-iverilog git rsync make curl wget
+iverilog git rsync make curl wget tree python3.8-venv
diff --git a/docker/Dockerfile.master b/docker/Dockerfile.master
index 783197ee6..55a46fa47 100644
--- a/docker/Dockerfile.master
+++ b/docker/Dockerfile.master
@@ -7,3 +7,21 @@ RUN chmod +x yosys/install/bin/yosys yosys/install/bin/yosys-abc yosys/install/b
 ENV PATH="/opt/openfpga/openfpga:/opt/openfpga/yosys/install/bin:${PATH}"
 ENV PATH="/opt/openfpga/ace2:/opt/openfpga/abc:/opt/openfpga/vpr:${PATH}"
 ENV OPENFPGA_PATH="/opt/openfpga"
+
+ARG NB_USER=openfpga_user
+ARG NB_UID=1000
+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 chmod -R +r /opt/openfpga/
+USER ${NB_USER}
+
+WORKDIR ${HOME}