diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42579efa21..983ecbcbf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,20 @@ For details about compatibility between different releases, see the **Commitment
 
 ### Added
 
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [3.36.1] - unreleased
+
+### Added
+
 - `Count` RPC on `EndDeviceRegistry` to efficiently retrieve the number of end devices in an application.
 - Add tracing for LBS LNS and TTIGW protocol handlers.
 - TTGC LBS Root CUPS claiming support.
@@ -22,16 +36,10 @@ For details about compatibility between different releases, see the **Commitment
 
 - During the process of claiming a managed gateway, create the gateway in the registry before claiming it, not after.
 
-### Deprecated
-
-### Removed
-
 ### Fixed
 
 - Mutex locking that caused the rights to be fetched for authorization checks sequentially. This caused gateways to reconnect slowly after Gateway Server restarts and rpcs to timeout that were asserting gateway rights.
 
-### Security
-
 ## [3.36.0] - unreleased
 
 ### Fixed
@@ -3071,7 +3079,8 @@ For details about compatibility between different releases, see the **Commitment
 NOTE: These links should respect backports. See https://github.com/TheThingsNetwork/lorawan-stack/pull/1444/files#r333379706.
 -->
 
-[unreleased]: https://github.com/TheThingsNetwork/lorawan-stack/compare/v3.36.0...v3.36
+[unreleased]: https://github.com/TheThingsNetwork/lorawan-stack/compare/v3.36.1...v3.36
+[3.36.1]: https://github.com/TheThingsNetwork/lorawan-stack/compare/v3.36.0...v3.36.1
 [3.36.0]: https://github.com/TheThingsNetwork/lorawan-stack/compare/v3.35.2...v3.36.0
 [3.35.2]: https://github.com/TheThingsNetwork/lorawan-stack/compare/v3.35.1...v3.35.2
 [3.35.1]: https://github.com/TheThingsNetwork/lorawan-stack/compare/v3.35.0...v3.35.1