diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80be4dbad5..e5046c9236 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,10 @@
   * [Unreleased Changes][0]
 
 ## Current release:
-  * [CHANGELOG-0.20.md][20]
+  * [CHANGELOG-0.21.md][21]
 
 ## Older releases:
+  * [CHANGELOG-0.20.md][20]
   * [CHANGELOG-0.19.md][19]
   * [CHANGELOG-0.18.md][18]
   * [CHANGELOG-0.17.md][17]
@@ -40,3 +41,4 @@
 [18]: https://github.com/vmware-tanzu/octant/blob/master/changelogs/CHANGELOG-0.18.md
 [19]: https://github.com/vmware-tanzu/octant/blob/master/changelogs/CHANGELOG-0.19.md
 [20]: https://github.com/vmware-tanzu/octant/blob/master/changelogs/CHANGELOG-0.20.md
+[21]: https://github.com/vmware-tanzu/octant/blob/master/changelogs/CHANGELOG-0.21.md
diff --git a/build.go b/build.go
index 2feac6b6df..6805873f2d 100644
--- a/build.go
+++ b/build.go
@@ -25,7 +25,7 @@ import (
 )
 
 var (
-	VERSION    = "v0.20.0"
+	VERSION    = "v0.21.0"
 	GOPATH     = os.Getenv("GOPATH")
 	GIT_COMMIT = gitCommit()
 	BUILD_TIME = time.Now().UTC().Format(time.RFC3339)
diff --git a/changelogs/CHANGELOG-0.21.md b/changelogs/CHANGELOG-0.21.md
new file mode 100644
index 0000000000..d0d1f22d7a
--- /dev/null
+++ b/changelogs/CHANGELOG-0.21.md
@@ -0,0 +1,22 @@
+## v0.21.0
+#### 2021-06-16
+
+### Download
+ - https://github.com/vmware-tanzu/octant/releases/v0.21.0
+
+### Highlights
+  * Added Horizontal stacking of fields (#2020, @lenriquez)
+  * Improved Resource Viewer initial selection (#2408, @mklanjsek)
+  * Updated preferences to show local path to kube config (#2478, @xtreme-vikram-yadav)
+
+### Bug Fixes
+  * Fixed bug where actions were not passed to components (#2458, @GuessWhoSamFoo)
+
+### All Changes
+  * Moved managed fields in YAML tab to metadata using JSON editor (#2132, @GuessWhoSamFoo)
+  * Added flag to disable cross origin check (#2384, @GuessWhoSamFoo)
+  * Added properties pane to Resource Viewer (#2409, @mklanjsek)
+  * Added SelectFile component (#2425, @mklanjsek)
+  * Added support for cds-alert for cards, flexbox, modal and summary components. (#2438, @xtreme-vikram-yadav)
+  * Added tabs as components (#2482, @ftovaro-lenriquez)
+
diff --git a/changelogs/unreleased/2020-lenriquez b/changelogs/unreleased/2020-lenriquez
deleted file mode 100644
index f1e6b2eec7..0000000000
--- a/changelogs/unreleased/2020-lenriquez
+++ /dev/null
@@ -1 +0,0 @@
-Horizontal stacking of fields
diff --git a/changelogs/unreleased/2132-GuessWhoSamFoo b/changelogs/unreleased/2132-GuessWhoSamFoo
deleted file mode 100644
index fe6cb5586b..0000000000
--- a/changelogs/unreleased/2132-GuessWhoSamFoo
+++ /dev/null
@@ -1 +0,0 @@
-Moved managed fields in YAML tab to metadata using JSON editor
diff --git a/changelogs/unreleased/2384-GuessWhoSamFoo b/changelogs/unreleased/2384-GuessWhoSamFoo
deleted file mode 100644
index 18776f8ad4..0000000000
--- a/changelogs/unreleased/2384-GuessWhoSamFoo
+++ /dev/null
@@ -1 +0,0 @@
-Added flag to disable cross origin check
diff --git a/changelogs/unreleased/2408-mklanjsek b/changelogs/unreleased/2408-mklanjsek
deleted file mode 100644
index f0399720ad..0000000000
--- a/changelogs/unreleased/2408-mklanjsek
+++ /dev/null
@@ -1 +0,0 @@
-Improved Resource Viewer initial selection
diff --git a/changelogs/unreleased/2409-mklanjsek b/changelogs/unreleased/2409-mklanjsek
deleted file mode 100644
index 41976c10ab..0000000000
--- a/changelogs/unreleased/2409-mklanjsek
+++ /dev/null
@@ -1 +0,0 @@
-Added properties pane to Resource Viewer
diff --git a/changelogs/unreleased/2438-xtreme-vikram-yadav b/changelogs/unreleased/2438-xtreme-vikram-yadav
deleted file mode 100644
index db0621e1d0..0000000000
--- a/changelogs/unreleased/2438-xtreme-vikram-yadav
+++ /dev/null
@@ -1 +0,0 @@
-Added support for cds-alert for cards, flexbox, modal and summary components.
\ No newline at end of file
diff --git a/changelogs/unreleased/2458-GuessWhoSamFoo b/changelogs/unreleased/2458-GuessWhoSamFoo
deleted file mode 100644
index f49f20b156..0000000000
--- a/changelogs/unreleased/2458-GuessWhoSamFoo
+++ /dev/null
@@ -1 +0,0 @@
-Fixed bug where actions were not passed to components
diff --git a/changelogs/unreleased/2478-xtreme-vikram-yadav b/changelogs/unreleased/2478-xtreme-vikram-yadav
deleted file mode 100644
index 88c0363191..0000000000
--- a/changelogs/unreleased/2478-xtreme-vikram-yadav
+++ /dev/null
@@ -1 +0,0 @@
-Updated preferences to show local path to kube config
\ No newline at end of file
diff --git a/changelogs/unreleased/2482-ftovaro-lenriquez b/changelogs/unreleased/2482-ftovaro-lenriquez
deleted file mode 100644
index 2609461b47..0000000000
--- a/changelogs/unreleased/2482-ftovaro-lenriquez
+++ /dev/null
@@ -1 +0,0 @@
-Added tabs as components
diff --git a/web/package.json b/web/package.json
index 7f767ddccd..09198e59ad 100644
--- a/web/package.json
+++ b/web/package.json
@@ -2,7 +2,7 @@
   "name": "octant",
   "description": "Octant is an extensible platform that provides modules that help developers better understand their Kuberenetes resources.",
   "author": "The Octant Team",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "homepage": "https://octant.dev",
   "repository": {
     "type": "git",