diff --git a/Dockerfile b/Dockerfile
index 3f33ae8d63c2d30f0b1aef2f2e933dcd153e9194..684ef0e91ad803e62615623ea5aaf7e9e38f9d3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ RUN apt update; apt install nano
 RUN pip install jupyter
 RUN pip install netron
 RUN pip install matplotlib
+RUN apt-get install -y build-essential libglib2.0-0 libsm6 libxext6 libxrender-dev
 
 # Note that we expect the cloned finn directory on the host to be
 # mounted on /workspace/finn -- see run-docker.sh for an example
@@ -37,4 +38,6 @@ RUN ln -s /workspace /home/$UNAME
 RUN chown -R $UNAME:$GNAME /home/$UNAME
 USER $UNAME
 
+RUN echo "source \$VIVADO_PATH/settings64.sh" >> /home/$UNAME/.bashrc
+
 WORKDIR /home/$UNAME/finn
diff --git a/run-docker.sh b/run-docker.sh
index f21674e9d42e0cde2bb1c2c0ad195882182c16f5..cef8fc12b57c794d7df20412168d6b48b920f836 100755
--- a/run-docker.sh
+++ b/run-docker.sh
@@ -39,7 +39,7 @@ echo "Mounting $SCRIPTPATH/brevitas into /workspace/brevitas"
 echo "Mounting $SCRIPTPATH/brevitas_cnv_lfc into /workspace/brevitas_cnv_lfc"
 echo "Mounting $SCRIPTPATH/cnpy into /workspace/cnpy"
 echo "Mounting $SCRIPTPATH/finn-hlslib into /workspace/finn-hlslib"
-echo "Mounting $VIVADO_PATH into /workspace/vivado"
+echo "Mounting $VIVADO_PATH into $VIVADO_PATH"
 
 if [ "$1" = "test" ]; then
 	echo "Running test suite"
@@ -68,6 +68,7 @@ docker run --rm --name finn_dev -it \
 -v $SCRIPTPATH/brevitas_cnv_lfc:/workspace/brevitas_cnv_lfc \
 -v $SCRIPTPATH/cnpy:/workspace/cnpy \
 -v $SCRIPTPATH/finn-hlslib:/workspace/finn-hlslib \
--v $VIVADO_PATH:/workspace/vivado \
+-v $VIVADO_PATH:$VIVADO_PATH \
+-e VIVADO_PATH=$VIVADO_PATH \
 -p 8888:8888 -p 8081:8081 \
 $DOCKER_TAG $DOCKER_CMD