diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ef07d9123..031cc88af8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,28 @@ 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/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.22.0] - 2021-07-30
+### Added
+- Add users and groups to default search index ([#1738](https://github.com/scm-manager/scm-manager/pull/1738))
+- Add dedicated search page with more details and different types ([#1738](https://github.com/scm-manager/scm-manager/pull/1738))
+
+### Changed
+- Remove repository shortlinks ([#1720](https://github.com/scm-manager/scm-manager/pull/1720))
+- The simple workdir cache has a maximum size, an lru semantic and blocks on parallel requests ([#1735](https://github.com/scm-manager/scm-manager/pull/1735))
+- Add username/password authentication to push command ([#1734](https://github.com/scm-manager/scm-manager/pull/1734))
+- Decrease log level of DefaultAdministrationContext from info to debug
+- Logo for small header
+- Redesign repository overview ([#1740](https://github.com/scm-manager/scm-manager/pull/1740))
+
+### Fixed
+- Make MarkdownView backwards-compatible with edge-cases ([#1737](https://github.com/scm-manager/scm-manager/pull/1737))
+- Handle rejected master branch on initial mirror synchronization correctly ([#1747](https://github.com/scm-manager/scm-manager/pull/1747))
+- Fix file search on branches with "/" ([#1748](https://github.com/scm-manager/scm-manager/pull/1748))
+- Fix overflow of quick search results with long repository names ([#1739](https://github.com/scm-manager/scm-manager/pull/1739))
+- Fix login extension point ([#1741](https://github.com/scm-manager/scm-manager/pull/1741))
+- Fix file detection on hg fileview command ([#1746](https://github.com/scm-manager/scm-manager/pull/1746))
+- Fix svn mirror update if first initialization failed before ([#1745](https://github.com/scm-manager/scm-manager/pull/1745))
+
 ## [2.21.0] - 2021-07-21
 ### Added
 - API to index and query objects ([#1727](https://github.com/scm-manager/scm-manager/pull/1727))
@@ -688,3 +710,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [2.19.1]: https://www.scm-manager.org/download/2.19.1
 [2.20.0]: https://www.scm-manager.org/download/2.20.0
 [2.21.0]: https://www.scm-manager.org/download/2.21.0
+[2.22.0]: https://www.scm-manager.org/download/2.22.0
diff --git a/gradle/changelog/decrease_logging.yaml b/gradle/changelog/decrease_logging.yaml
deleted file mode 100644
index 7512fb74bc..0000000000
--- a/gradle/changelog/decrease_logging.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: Changed
-  description: Decrease log level of DefaultAdministrationContext from info to debug
diff --git a/gradle/changelog/enhance_push_command.yaml b/gradle/changelog/enhance_push_command.yaml
deleted file mode 100644
index 8d609f60db..0000000000
--- a/gradle/changelog/enhance_push_command.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: changed
-  description: Add username/password authentication to push command ([#1734](https://github.com/scm-manager/scm-manager/pull/1734))
diff --git a/gradle/changelog/file_search.yaml b/gradle/changelog/file_search.yaml
deleted file mode 100644
index 453b1452c0..0000000000
--- a/gradle/changelog/file_search.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: Fixed
-  description: Fix file search on branches with "/" ([#1748](https://github.com/scm-manager/scm-manager/pull/1748))
diff --git a/gradle/changelog/header_login_extension.yaml b/gradle/changelog/header_login_extension.yaml
deleted file mode 100644
index 65562e117a..0000000000
--- a/gradle/changelog/header_login_extension.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: Fixed
-  description: Fix login extension point ([#1741](https://github.com/scm-manager/scm-manager/pull/1741))
diff --git a/gradle/changelog/hg_fileview_command.yaml b/gradle/changelog/hg_fileview_command.yaml
deleted file mode 100644
index 3d69ff6dd2..0000000000
--- a/gradle/changelog/hg_fileview_command.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: Fixed
-  description: Fix file detection on hg fileview command ([#1746](https://github.com/scm-manager/scm-manager/pull/1746))
diff --git a/gradle/changelog/logo.yaml b/gradle/changelog/logo.yaml
deleted file mode 100644
index d8891ce42c..0000000000
--- a/gradle/changelog/logo.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: Changed
-  description: Logo for small header
diff --git a/gradle/changelog/master_on_initial_mirror.yaml b/gradle/changelog/master_on_initial_mirror.yaml
deleted file mode 100644
index d5572ba76f..0000000000
--- a/gradle/changelog/master_on_initial_mirror.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Handle rejected master branch on initial mirror synchronization correctly ([#1747](https://github.com/scm-manager/scm-manager/pull/1747))
diff --git a/gradle/changelog/quicksearch_overflow.yaml b/gradle/changelog/quicksearch_overflow.yaml
deleted file mode 100644
index 4642b5f45a..0000000000
--- a/gradle/changelog/quicksearch_overflow.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: Fixed
-  description: Fix overflow of quick search results with long repository names ([#1739](https://github.com/scm-manager/scm-manager/pull/1739))
diff --git a/gradle/changelog/redesign_repo_overview.yaml b/gradle/changelog/redesign_repo_overview.yaml
deleted file mode 100644
index 5c08c5a5e7..0000000000
--- a/gradle/changelog/redesign_repo_overview.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: Changed
-  description: Redesign repository overview ([#1740](https://github.com/scm-manager/scm-manager/pull/1740))
diff --git a/gradle/changelog/remark-text-adapter.yaml b/gradle/changelog/remark-text-adapter.yaml
deleted file mode 100644
index 7e1d5fd493..0000000000
--- a/gradle/changelog/remark-text-adapter.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Make MarkdownView backwards-compatible with edge-cases ([#1737](https://github.com/scm-manager/scm-manager/pull/1737))
diff --git a/gradle/changelog/remove_repo_shortlinks.yaml b/gradle/changelog/remove_repo_shortlinks.yaml
deleted file mode 100644
index 4118e05153..0000000000
--- a/gradle/changelog/remove_repo_shortlinks.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: changed
-  description: Remove repository shortlinks ([#1720](https://github.com/scm-manager/scm-manager/pull/1720))
diff --git a/gradle/changelog/search.yaml b/gradle/changelog/search.yaml
deleted file mode 100644
index 9f20ca419b..0000000000
--- a/gradle/changelog/search.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: Added
-  description: Add users and groups to default search index ([#1738](https://github.com/scm-manager/scm-manager/pull/1738))
-- type: Added
-  description: Add dedicated search page with more details and different types ([#1738](https://github.com/scm-manager/scm-manager/pull/1738))
diff --git a/gradle/changelog/simple_workdir_cache.yaml b/gradle/changelog/simple_workdir_cache.yaml
deleted file mode 100644
index 7ff1960e21..0000000000
--- a/gradle/changelog/simple_workdir_cache.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: changed
-  description: The simple workdir cache has a maximum size, an lru semantic and blocks on parallel requests ([#1735](https://github.com/scm-manager/scm-manager/pull/1735))
diff --git a/gradle/changelog/svn_mirror_update.yaml b/gradle/changelog/svn_mirror_update.yaml
deleted file mode 100644
index b51038f675..0000000000
--- a/gradle/changelog/svn_mirror_update.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: Fixed
-  description: Fix svn mirror update if first initialization failed before ([#1745](https://github.com/scm-manager/scm-manager/pull/1745))