diff --git a/core/embed/bootloader/.changelog.d/3370.added b/core/embed/bootloader/.changelog.d/3370.added
deleted file mode 100644
index 20f7c8646..000000000
--- a/core/embed/bootloader/.changelog.d/3370.added
+++ /dev/null
@@ -1 +0,0 @@
-Added basic support for STM32U5
diff --git a/core/embed/bootloader/.changelog.d/3429.changed b/core/embed/bootloader/.changelog.d/3429.changed
deleted file mode 100644
index 49b350895..000000000
--- a/core/embed/bootloader/.changelog.d/3429.changed
+++ /dev/null
@@ -1 +0,0 @@
-Speed-up device boot
diff --git a/core/embed/bootloader/CHANGELOG.md b/core/embed/bootloader/CHANGELOG.md
index a9607a842..0e156e915 100644
--- a/core/embed/bootloader/CHANGELOG.md
+++ b/core/embed/bootloader/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 2.1.5 [April 2024]
+
+### Added
+- Added support for T3T1
+- Added basic support for STM32U5  [#3370]
+
+### Changed
+- Speed-up device boot  [#3429]
+
+
 ## 2.1.4 [November 2023]
 
 ### Added
@@ -117,3 +127,5 @@ Internal only release for Model R prototypes.
 [#3205]: https://github.com/trezor/trezor-firmware/pull/3205
 [#3222]: https://github.com/trezor/trezor-firmware/pull/3222
 [#3303]: https://github.com/trezor/trezor-firmware/pull/3303
+[#3370]: https://github.com/trezor/trezor-firmware/pull/3370
+[#3429]: https://github.com/trezor/trezor-firmware/pull/3429
diff --git a/core/embed/prodtest/.changelog.d/3370.added b/core/embed/prodtest/.changelog.d/3370.added
deleted file mode 100644
index 20f7c8646..000000000
--- a/core/embed/prodtest/.changelog.d/3370.added
+++ /dev/null
@@ -1 +0,0 @@
-Added basic support for STM32U5
diff --git a/core/embed/prodtest/CHANGELOG.md b/core/embed/prodtest/CHANGELOG.md
index 0cb3e0272..1582b496a 100644
--- a/core/embed/prodtest/CHANGELOG.md
+++ b/core/embed/prodtest/CHANGELOG.md
@@ -1,4 +1,14 @@
 
+## 0.2.5 [16th April 2024]
+
+### Added
+- Added basic support for STM32U5.  [#3370]
+- [T3T1] Added support for T3T1.
+- [T3T1] Added `HAPTIC` to test haptic feedback.
+- [T2T1, T3T1] Added `TOUCH VERSION` to get version number of touch controller.
+- Added `VARIANT READ` to read out result of `VARIANT` command.
+
+
 ## 0.2.4 [20th December 2023]
 
 ### Added
@@ -21,3 +31,4 @@
 
 
 [#3325]: https://github.com/trezor/trezor-firmware/pull/3325
+[#3370]: https://github.com/trezor/trezor-firmware/pull/3370