diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87e6f2b394..4d92811b50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,18 @@ 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.20.0] - 2021-06-16
+### Added
+- Support basic authentication with access token ([#1694](https://github.com/scm-manager/scm-manager/pulls/1694))
+- Form elements that support react-hook-form can now be made read-only ([#1696](https://github.com/scm-manager/scm-manager/pulls/1696))
+
+### Fixed
+- Post receive hook events after mirror update for git ([#1703](https://github.com/scm-manager/scm-manager/pulls/1703))
+- Added option to increase LFS authorization token timeout ([#1697](https://github.com/scm-manager/scm-manager/pull/1697))
+- Uniform rendering of tooltips for repository badges ([#1698](https://github.com/scm-manager/scm-manager/pull/1698))
+- Clear related caches if gpg key was added or deleted ([#1701](https://github.com/scm-manager/scm-manager/pull/1701))
+- Redirect after single tag was deleted ([#1700](https://github.com/scm-manager/scm-manager/pull/1700))
+
 ## [2.19.1] - 2021-06-09
 ### Fixed
 - Add handling when duplicated branch part cannot be created ([#1692](https://github.com/scm-manager/scm-manager/pull/1692))
@@ -653,3 +665,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [2.18.0]: https://www.scm-manager.org/download/2.18.0
 [2.19.0]: https://www.scm-manager.org/download/2.19.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
diff --git a/gradle/changelog/basic_auth_with_access_token.yaml b/gradle/changelog/basic_auth_with_access_token.yaml
deleted file mode 100644
index 67e43450ae..0000000000
--- a/gradle/changelog/basic_auth_with_access_token.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: added
-  description: Support basic authentication with access token ([#1694](https://github.com/scm-manager/scm-manager/pulls/1694))
diff --git a/gradle/changelog/delete_tag_with_redirect.yaml b/gradle/changelog/delete_tag_with_redirect.yaml
deleted file mode 100644
index dc423b352e..0000000000
--- a/gradle/changelog/delete_tag_with_redirect.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Redirect after single tag was deleted ([#1700](https://github.com/scm-manager/scm-manager/pull/1700))
diff --git a/gradle/changelog/invalidate_caches_for_gpg_keys.yaml b/gradle/changelog/invalidate_caches_for_gpg_keys.yaml
deleted file mode 100644
index 4101d7a562..0000000000
--- a/gradle/changelog/invalidate_caches_for_gpg_keys.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Clear related caches if gpg key was added or deleted ([#1701](https://github.com/scm-manager/scm-manager/pull/1701))
diff --git a/gradle/changelog/lfs_auth_expiration.yaml b/gradle/changelog/lfs_auth_expiration.yaml
deleted file mode 100644
index 285ed33662..0000000000
--- a/gradle/changelog/lfs_auth_expiration.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Added option to increase LFS authorization token timeout ([#1697](https://github.com/scm-manager/scm-manager/pull/1697))
diff --git a/gradle/changelog/mirror_post_receive_hook_git.yaml b/gradle/changelog/mirror_post_receive_hook_git.yaml
deleted file mode 100644
index 2d068106ba..0000000000
--- a/gradle/changelog/mirror_post_receive_hook_git.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Post receive hook events after mirror update for git ([#1703](https://github.com/scm-manager/scm-manager/pulls/1703))
diff --git a/gradle/changelog/readonly_form_elements.yaml b/gradle/changelog/readonly_form_elements.yaml
deleted file mode 100644
index 23cea09f81..0000000000
--- a/gradle/changelog/readonly_form_elements.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: added
-  description: Form elements that support react-hook-form can now be made read-only ([#1696](https://github.com/scm-manager/scm-manager/pulls/1696))
diff --git a/gradle/changelog/repository_flags.yaml b/gradle/changelog/repository_flags.yaml
deleted file mode 100644
index 0005d60cda..0000000000
--- a/gradle/changelog/repository_flags.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Uniform rendering of tooltips for repository badges ([#1698](https://github.com/scm-manager/scm-manager/pull/1698))