diff --git a/core/SConscript.firmware b/core/SConscript.firmware
index bb9a530ca5..9923c076a0 100644
--- a/core/SConscript.firmware
+++ b/core/SConscript.firmware
@@ -800,9 +800,6 @@ BOOTLOADER_SUFFIX = MODEL_IDENTIFIER
 if BOOTLOADER_QA:
     VENDORHEADER = f'embed/vendorheader/{MODEL_IDENTIFIER}/vendorheader_qa_DO_NOT_SIGN_signed_dev.bin'
     BOOTLOADER_SUFFIX = MODEL_IDENTIFIER + '_qa'
-elif TREZOR_MODEL == 'R':
-    # XXX workaround for currently missing vendorheaders for T2B1
-    VENDORHEADER = f'embed/vendorheader/{MODEL_IDENTIFIER}/vendorheader_unsafe_signed_dev.bin'
 elif PRODUCTION:
     VENDORHEADER = f'embed/vendorheader/{MODEL_IDENTIFIER}/vendorheader_satoshilabs_signed_prod.bin'
 else:
diff --git a/core/embed/firmware/bootloaders/bootloader_T2B1.bin b/core/embed/firmware/bootloaders/bootloader_T2B1.bin
index e321c041b5..ed76a2da0e 100644
Binary files a/core/embed/firmware/bootloaders/bootloader_T2B1.bin and b/core/embed/firmware/bootloaders/bootloader_T2B1.bin differ
diff --git a/core/embed/vendorheader/T2B1/vendorheader_satoshilabs_signed_prod.bin b/core/embed/vendorheader/T2B1/vendorheader_satoshilabs_signed_prod.bin
new file mode 100644
index 0000000000..35e93a0521
Binary files /dev/null and b/core/embed/vendorheader/T2B1/vendorheader_satoshilabs_signed_prod.bin differ
diff --git a/core/embed/vendorheader/T2B1/vendorheader_unsafe_signed_prod.bin b/core/embed/vendorheader/T2B1/vendorheader_unsafe_signed_prod.bin
new file mode 100644
index 0000000000..84493d4015
Binary files /dev/null and b/core/embed/vendorheader/T2B1/vendorheader_unsafe_signed_prod.bin differ