diff --git a/build-docker.sh b/build-docker.sh
index d323cd95b..1fd493c57 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -108,7 +108,9 @@ for BITCOIN_ONLY in 0 1; do
     git submodule update --init --recursive
     poetry install
     poetry run script/cibuild
-    mkdir -p build/firmware
+    mkdir -p build/bootloader build/firmware build/intermediate_fw
+    cp bootloader/bootloader.bin build/bootloader/bootloader.bin
+    cp intermediate_fw/trezor.bin build/intermediate_fw/inter.bin
     cp firmware/trezor.bin build/firmware/firmware.bin
     cp firmware/trezor.elf build/firmware/firmware.elf
     poetry run ../python/tools/firmware-fingerprint.py \
diff --git a/legacy/script/cibuild b/legacy/script/cibuild
index 436907572..c3825f443 100755
--- a/legacy/script/cibuild
+++ b/legacy/script/cibuild
@@ -25,6 +25,9 @@ make -C firmware/protob
 
 make -C firmware
 
+make -C intermediate_fw
+
 if [ "$EMULATOR" != 1 ]; then
     make -C firmware sign
+    make -C intermediate_fw sign
 fi