diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b476a9b..053bd3ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
 
+## [6.21.0] - 2024-07-24
+
 ### Added
 
 - Add a block in the main richie nginx location
@@ -1223,7 +1225,8 @@ Versioning](http://semver.org/spec/v2.0.0.html).
 - Official Docker image is available at:
   https://hub.docker.com/r/fundocker/arnold/
 
-[unreleased]: https://github.com/openfun/arnold/compare/v6.20.0...master
+[unreleased]: https://github.com/openfun/arnold/compare/v6.21.0...master
+[6.21.0]: https://github.com/openfun/arnold/compare/v6.20.0...v6.21.0
 [6.20.0]: https://github.com/openfun/arnold/compare/v6.19.2...v6.20.0
 [6.19.2]: https://github.com/openfun/arnold/compare/v6.19.1...v6.19.2
 [6.19.1]: https://github.com/openfun/arnold/compare/v6.19.0...v6.19.1
diff --git a/VERSION b/VERSION
index a7c176ac..7ecad140 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.20.0
+6.21.0