diff --git a/docker/finn_entrypoint.sh b/docker/finn_entrypoint.sh
index b667562d3fb1bfb943943d2edce9a99486b4e8a0..003cd515b4f238fcf4835eaeb545e1de3b5db4f0 100644
--- a/docker/finn_entrypoint.sh
+++ b/docker/finn_entrypoint.sh
@@ -74,5 +74,10 @@ if [ ! -d "/workspace/finn/board_files" ]; then
     rm pynq-z1.zip
     rm pynq-z2.zip
 fi
-
+if [ ! -d "/workspace/finn/board_files/ultra96v1" ]; then
+    gecho "Downloading Avnet BDF files into board_files"
+    git clone https://github.com/Avnet/bdf.git
+    mv /workspace/finn/bdf/* /workspace/finn/board_files/
+    rm -rf /workspace/finn/bdf
+fi
 exec "$@"
diff --git a/src/finn/transformation/fpgadataflow/templates.py b/src/finn/transformation/fpgadataflow/templates.py
index 35ed8cd5545b6bc2a8a9bab8836f80e3fe9f3434..2eb7380234348f23d2fc0314b9b454a23a65243b 100644
--- a/src/finn/transformation/fpgadataflow/templates.py
+++ b/src/finn/transformation/fpgadataflow/templates.py
@@ -329,6 +329,7 @@ if {$BOARD == "ZCU104"} {
     set_property board_part xilinx.com:zcu104:part0:1.1 [current_project]
     set ZYNQ_TYPE "zynq_us+"
 } elseif {$BOARD == "Ultra96"} {
+    set_property board_part em.avnet.com:ultra96v1:part0:1.2 [current_project]
     set ZYNQ_TYPE "zynq_us+"
 } elseif {$BOARD == "Pynq-Z2"} {
     set ZYNQ_TYPE "zynq_7000"