diff --git a/docker/Dockerfile.finn b/docker/Dockerfile.finn
index 3a3090b95d7f12d59ea037c2950d03d59a472863..5a7a90ec41668d1d5f44964f3bd32efb9d6d25bd 100644
--- a/docker/Dockerfile.finn
+++ b/docker/Dockerfile.finn
@@ -86,6 +86,8 @@ RUN pip install -e git+https://github.com/fbcotter/dataset_loading.git@0.0.4#egg
 
 # git-based Python repo dependencies
 # these are installed in editable mode for easier co-development
+ARG FINN_BASE_COMMIT="17687a6a3371936147ceb4ed0d49f985a7ea9fde"
+ARG QONNX_COMMIT="02b15f56d199576cefe9aff672d5e009349e402a"
 ARG FINN_EXP_COMMIT="f82c0d9868bb88ea045dfadb28508d327d287221"
 ARG BREVITAS_COMMIT="462f86cdc60f9915baf13afd1676fb21da44c2ee"
 ARG PYVERILATOR_COMMIT="0c3eb9343500fc1352a02c020a736c8c2db47e8e"
@@ -93,11 +95,15 @@ ARG CNPY_COMMIT="4e8810b1a8637695171ed346ce68f6984e585ef4"
 ARG HLSLIB_COMMIT="fbb07135b3d991602e8abe3f2c51212c11fd392b"
 ARG OMX_COMMIT="1dfc4aa2f2895632742cd5751520c6b472feb74e"
 ARG AVNET_BDF_COMMIT="2d49cfc25766f07792c0b314489f21fe916b639b"
-ARG QONNX_COMMIT="02b15f56d199576cefe9aff672d5e009349e402a"
-# qonnx
+
+# finn-base
+RUN git clone https://github.com/Xilinx/finn-base.git /workspace/finn-base
+RUN git -C /workspace/finn-base checkout $FINN_BASE_COMMIT
+RUN pip install -e /workspace/finn-base
+# Install qonnx without dependencies, currently its only dependency is finn-base
 RUN git clone https://github.com/fastmachinelearning/qonnx.git /workspace/qonnx
 RUN git -C /workspace/qonnx checkout $QONNX_COMMIT
-RUN pip install -e /workspace/qonnx
+RUN pip install --no-dependencies -e /workspace/qonnx
 # finn-experimental
 RUN git clone https://github.com/Xilinx/finn-experimental.git /workspace/finn-experimental
 RUN git -C /workspace/finn-experimental checkout $FINN_EXP_COMMIT