diff --git a/core/embed/firmware/bl_check.c b/core/embed/firmware/bl_check.c
index c72075b691..94a1a9666f 100644
--- a/core/embed/firmware/bl_check.c
+++ b/core/embed/firmware/bl_check.c
@@ -64,18 +64,18 @@ static secbool known_bootloader(const uint8_t *hash, int len) {
 // bootloader_T1B1.bin version <unknown>
 #define BOOTLOADER_T1B1_00 {0xc1, 0x01, 0xd3, 0x8a, 0x00, 0x5e, 0x4f, 0x5f, 0x87, 0x1f, 0x49, 0x78, 0x24, 0x9c, 0xf9, 0x82, 0xd1, 0x91, 0x4b, 0xa6, 0x90, 0x03, 0x9c, 0x50, 0x49, 0x61, 0x10, 0x4f, 0xee, 0xe7, 0x1d, 0x7b}
 #define BOOTLOADER_T1B1_FF {0xbd, 0xb2, 0xf7, 0x62, 0xfb, 0x10, 0xbb, 0x30, 0x1f, 0x95, 0xa3, 0x12, 0x6b, 0x41, 0x1f, 0x66, 0xfc, 0x57, 0x28, 0xce, 0x7f, 0x59, 0x42, 0x6c, 0x3e, 0xed, 0xf7, 0x69, 0xbb, 0x96, 0xbd, 0x4b}
-// bootloader_T2T1.bin version 2.0.3.0
-#define BOOTLOADER_T2T1_00 {0xb1, 0x83, 0xd3, 0x31, 0xc7, 0xff, 0x3d, 0xcf, 0x54, 0x1e, 0x7e, 0x40, 0xf4, 0x9e, 0xc3, 0x53, 0x4c, 0xcc, 0xf3, 0x8c, 0x35, 0x39, 0x88, 0x81, 0x65, 0xc0, 0x5c, 0x25, 0xbd, 0xfc, 0xea, 0x14}
-#define BOOTLOADER_T2T1_FF {0xab, 0xdb, 0x7d, 0xe2, 0xef, 0x44, 0x66, 0xa7, 0xb7, 0x1f, 0x2b, 0x02, 0xf3, 0xe1, 0x40, 0xe7, 0xcd, 0xf2, 0x8e, 0xc0, 0xbb, 0x33, 0x04, 0xce, 0x0d, 0xa5, 0xca, 0x02, 0x57, 0xb6, 0xd4, 0x30}
-// bootloader_T2T1_qa.bin version 2.1.0.0
-#define BOOTLOADER_T2T1_QA_00 {0x61, 0xae, 0x70, 0xd3, 0xf9, 0x13, 0x4f, 0x79, 0x99, 0xd1, 0x5d, 0x3e, 0x68, 0xd6, 0x27, 0x96, 0x16, 0x85, 0xc6, 0x8e, 0x80, 0x7e, 0xae, 0x36, 0xaa, 0x5f, 0x2f, 0xa4, 0xb4, 0x59, 0x04, 0x2e}
-#define BOOTLOADER_T2T1_QA_FF {0xe4, 0x52, 0x96, 0x96, 0x40, 0x03, 0xa0, 0xb5, 0x91, 0x2d, 0xe3, 0x11, 0x65, 0xd3, 0xb8, 0x92, 0x2e, 0x87, 0x41, 0xab, 0xe8, 0x94, 0x62, 0x2e, 0x41, 0x1f, 0x0b, 0x47, 0xe2, 0x8c, 0x83, 0xaa}
-// bootloader_1.bin version <unknown>
-#define BOOTLOADER_1_00 {0xa5, 0x5a, 0x8b, 0x88, 0x94, 0x8a, 0x33, 0x2b, 0xed, 0x0d, 0xd9, 0x5c, 0x79, 0xd5, 0xbe, 0x0c, 0x73, 0x52, 0xaa, 0xac, 0xb3, 0x4f, 0xea, 0xd0, 0xaa, 0x88, 0x33, 0x23, 0x64, 0xab, 0x77, 0x5a}
-#define BOOTLOADER_1_FF {0x50, 0x6c, 0x5f, 0xd3, 0x73, 0x7b, 0x9b, 0xb7, 0xb9, 0xbf, 0xf9, 0xfa, 0xc6, 0xb9, 0x43, 0x27, 0x8b, 0x06, 0xad, 0x3a, 0xec, 0xce, 0x35, 0xa3, 0x52, 0xc3, 0x6e, 0x9e, 0x9a, 0xb3, 0x50, 0x98}
 // bootloader_T2B1.bin version 2.0.5.0
 #define BOOTLOADER_T2B1_00 {0xf1, 0x3d, 0x46, 0x21, 0xec, 0xf9, 0x92, 0xfb, 0x5c, 0x50, 0xaf, 0xdb, 0x55, 0x13, 0x0e, 0x7f, 0xbe, 0x5b, 0x30, 0x37, 0xc9, 0x17, 0xff, 0xf5, 0xe7, 0xd7, 0xe9, 0x1d, 0x09, 0x5c, 0xf3, 0x2a}
 #define BOOTLOADER_T2B1_FF {0xa9, 0xf0, 0x63, 0xfd, 0x8a, 0xe7, 0x6c, 0x52, 0x92, 0xcb, 0x11, 0x69, 0x87, 0x79, 0x62, 0x11, 0x1e, 0x01, 0x1e, 0xf1, 0xb5, 0xd9, 0x20, 0x16, 0x4d, 0x2c, 0x16, 0x41, 0x0d, 0xa1, 0xe7, 0xc8}
+// bootloader_1.bin version <unknown>
+#define BOOTLOADER_1_00 {0xa5, 0x5a, 0x8b, 0x88, 0x94, 0x8a, 0x33, 0x2b, 0xed, 0x0d, 0xd9, 0x5c, 0x79, 0xd5, 0xbe, 0x0c, 0x73, 0x52, 0xaa, 0xac, 0xb3, 0x4f, 0xea, 0xd0, 0xaa, 0x88, 0x33, 0x23, 0x64, 0xab, 0x77, 0x5a}
+#define BOOTLOADER_1_FF {0x50, 0x6c, 0x5f, 0xd3, 0x73, 0x7b, 0x9b, 0xb7, 0xb9, 0xbf, 0xf9, 0xfa, 0xc6, 0xb9, 0x43, 0x27, 0x8b, 0x06, 0xad, 0x3a, 0xec, 0xce, 0x35, 0xa3, 0x52, 0xc3, 0x6e, 0x9e, 0x9a, 0xb3, 0x50, 0x98}
+// bootloader_T2T1_qa.bin version 2.1.0.0
+#define BOOTLOADER_T2T1_QA_00 {0x5e, 0x54, 0x6a, 0x82, 0x62, 0x1a, 0x57, 0x13, 0xea, 0xc8, 0x1b, 0xa0, 0x5a, 0x99, 0xcd, 0x6d, 0xf2, 0x52, 0x6f, 0x0e, 0x8f, 0xfb, 0xa9, 0x34, 0xf0, 0xda, 0xd1, 0xcc, 0xa8, 0x12, 0x0c, 0xb4}
+#define BOOTLOADER_T2T1_QA_FF {0x04, 0x72, 0x80, 0x3f, 0x4d, 0xf8, 0xd2, 0x2c, 0x30, 0xf3, 0x80, 0x6b, 0x1d, 0xd0, 0x5a, 0xd9, 0x77, 0xb1, 0xab, 0x9e, 0x50, 0xa4, 0xa0, 0x1f, 0x32, 0xb4, 0x89, 0x06, 0xa8, 0x8d, 0x3d, 0xcb}
+// bootloader_T2T1.bin version 2.0.3.0
+#define BOOTLOADER_T2T1_00 {0xb1, 0x83, 0xd3, 0x31, 0xc7, 0xff, 0x3d, 0xcf, 0x54, 0x1e, 0x7e, 0x40, 0xf4, 0x9e, 0xc3, 0x53, 0x4c, 0xcc, 0xf3, 0x8c, 0x35, 0x39, 0x88, 0x81, 0x65, 0xc0, 0x5c, 0x25, 0xbd, 0xfc, 0xea, 0x14}
+#define BOOTLOADER_T2T1_FF {0xab, 0xdb, 0x7d, 0xe2, 0xef, 0x44, 0x66, 0xa7, 0xb7, 0x1f, 0x2b, 0x02, 0xf3, 0xe1, 0x40, 0xe7, 0xcd, 0xf2, 0x8e, 0xc0, 0xbb, 0x33, 0x04, 0xce, 0x0d, 0xa5, 0xca, 0x02, 0x57, 0xb6, 0xd4, 0x30}
 // --- END GENERATED BOOTLOADER SECTION ---
 
 #if defined TREZOR_MODEL_T
@@ -90,11 +90,11 @@ static secbool known_bootloader(const uint8_t *hash, int len) {
   #endif
 #elif defined TREZOR_MODEL_R
   #if BOOTLOADER_QA
-    // QA bootloaders for T2R1
+    // QA bootloaders for T2B1
     #define BOOTLOADER_00 BOOTLOADER_T2B1_QA_00
     #define BOOTLOADER_FF BOOTLOADER_T2B1_QA_FF
   #else
-    // normal bootloaders for T2R1
+    // normal bootloaders for T2B1
     #define BOOTLOADER_00 BOOTLOADER_T2B1_00
     #define BOOTLOADER_FF BOOTLOADER_T2B1_FF
   #endif
diff --git a/core/embed/firmware/bootloaders/bootloader_T2B1.bin b/core/embed/firmware/bootloaders/bootloader_T2B1.bin
old mode 100755
new mode 100644
diff --git a/core/embed/firmware/bootloaders/bootloader_T2T1_qa.bin b/core/embed/firmware/bootloaders/bootloader_T2T1_qa.bin
old mode 100755
new mode 100644
index c3bf9862d8..d48b101c4d
Binary files a/core/embed/firmware/bootloaders/bootloader_T2T1_qa.bin and b/core/embed/firmware/bootloaders/bootloader_T2T1_qa.bin differ