diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97fafca8..93dc0aff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
-## 0.21.0-rc.0 / 2020-06-05
+## 0.21.0 / 2020-06-16
+
+This release removes the HipChat integration as it is discontinued by Atlassian on June 30th 2020.
 
 * [CHANGE] [HipChat] Remove HipChat integration as it is end-of-life. #2282
 * [CHANGE] [amtool] Remove default assignment of environment variables. #2161
diff --git a/VERSION b/VERSION
index 60e5ebac..88541566 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.21.0-rc.0
+0.21.0