diff --git a/Dockerfile b/Dockerfile
index fa500ce52a0e5efb4f127eb8e658e1205e5e03af..09577dff56dd405b7f5af47d3dad9f56346d0407 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,9 @@ ARG PYTHON_VERSION=3.6
 
 WORKDIR /workspace
 RUN git clone https://github.com/maltanar/brevitas_cnv_lfc.git
-RUN git clone --branch feature/finn_onnx_export https://github.com/Xilinx/brevitas
-RUN cd brevitas; pip install .
+# Assume brevitas is cloned on host and mounted, see below.
+#RUN git clone --branch feature/finn_onnx_export https://github.com/Xilinx/brevitas
+#RUN cd brevitas; pip install .
 
 COPY requirements.txt .
 RUN pip install -r requirements.txt
@@ -15,4 +16,8 @@ RUN rm requirements.txt
 # Note that we expect the cloned finn directory on the host to be
 # mounted on /workspace/finn -- see run-docker.sh for an example
 # of how to do this.
-ENV PYTHONPATH "${PYTHONPATH}:/workspace/finn/src:/workspace/brevitas_cnv_lfc/training_scripts"
+ENV PYTHONPATH "${PYTHONPATH}:/workspace/finn/src"
+ENV PYTHONPATH "${PYTHONPATH}:/workspace/brevitas_cnv_lfc/training_scripts"
+
+# And this branch assumes the same for brevitas for easier co-development.
+ENTRYPOINT pip install -e /workspace/brevitas && /bin/bash
diff --git a/run-docker.sh b/run-docker.sh
index 9d6174df0807da9b96c1a8dc5dca29b06ac6c13f..d8a34ca26020d5b13e125c8e45692af85d34beb1 100755
--- a/run-docker.sh
+++ b/run-docker.sh
@@ -5,7 +5,11 @@ SCRIPT=$(readlink -f "$0")
 # Absolute path this script is in, thus /home/user/bin
 SCRIPTPATH=$(dirname "$SCRIPT")
 echo "Mounting $SCRIPTPATH into /workspace/finn"
+echo "Mounting $SCRIPTPATH/../brevitas into /workspace/brevitas"
 # Build the FINN Docker image
 docker build --tag=finn .
 # Launch container with current directory mounted
-docker run --rm --name finn_dev -it -v $SCRIPTPATH:/workspace/finn finn bash
+docker run --rm --name finn_dev -it \
+-v $SCRIPTPATH:/workspace/finn \
+-v $SCRIPTPATH/../brevitas:/workspace/brevitas \
+finn bash