diff --git a/.github/readme.md b/.github/readme.md
index 28a34596f..209cff3a6 100644
--- a/.github/readme.md
+++ b/.github/readme.md
@@ -64,7 +64,7 @@ You can generate a token by logging into your GitHub account and going to Settin
 
 Next we tag the PR's with the fixes or enhancements labels. If the PR does not fufil the requirements, do not add a label.
 
-** Before moving on make sure to update the version file `version/version.go`. **
+**Before moving on make sure to update the version file `version/version.go && version/version_test.go`.**
 
 Run the changelog generator again with the future version according to semver.
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f92add48..bbb243759 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Changelog
 
+## [v2.1.0](https://github.com/drone/drone/tree/v2.1.0) (2021-08-24)
+
+[Full Changelog](https://github.com/drone/drone/compare/v2.0.6...v2.1.0)
+
+**Implemented enhancements:**
+
+- \(maint\) ui version v2.0.1. - https://github.com/drone/drone-ui/blob/main/CHANGELOG.md [\#3123](https://github.com/drone/drone/pull/3123) ([d1wilko](https://github.com/d1wilko))
+- Feature/ add yaml templates [\#3120](https://github.com/drone/drone/pull/3120) ([eoinmcafee00](https://github.com/eoinmcafee00))
+
+**Fixed bugs:**
+
+- CheckMembership return forbidden if not found. [\#3122](https://github.com/drone/drone/pull/3122) ([eoinmcafee00](https://github.com/eoinmcafee00))
+- update template create api to accept namespace [\#3121](https://github.com/drone/drone/pull/3121) ([eoinmcafee00](https://github.com/eoinmcafee00))
+- update dependency drone/go-scm to 1.15.2 to fix gitea build problem [\#3118](https://github.com/drone/drone/pull/3118) ([sesky4](https://github.com/sesky4))
+
+## [v2.0.6](https://github.com/drone/drone/tree/v2.0.6) (2021-08-17)
+
+[Full Changelog](https://github.com/drone/drone/compare/v2.0.5...v2.0.6)
+
+**Merged pull requests:**
+
+- \(maint\) v2.0.6 release prep [\#3119](https://github.com/drone/drone/pull/3119) ([tphoney](https://github.com/tphoney))
+
 ## [v2.0.5](https://github.com/drone/drone/tree/v2.0.5) (2021-08-17)
 
 [Full Changelog](https://github.com/drone/drone/compare/v2.0.4...v2.0.5)
diff --git a/version/version.go b/version/version.go
index 741d73b38..1b55578ed 100644
--- a/version/version.go
+++ b/version/version.go
@@ -25,9 +25,9 @@ var (
 	// VersionMajor is for an API incompatible changes.
 	VersionMajor int64 = 2
 	// VersionMinor is for functionality in a backwards-compatible manner.
-	VersionMinor int64 = 0
+	VersionMinor int64 = 1
 	// VersionPatch is for backwards-compatible bug fixes.
-	VersionPatch int64 = 6
+	VersionPatch int64 = 0
 	// VersionPre indicates prerelease.
 	VersionPre = ""
 	// VersionDev indicates development branch. Releases will be empty string.
diff --git a/version/version_test.go b/version/version_test.go
index 9a78616f9..0d690ee64 100644
--- a/version/version_test.go
+++ b/version/version_test.go
@@ -9,7 +9,7 @@ package version
 import "testing"
 
 func TestVersion(t *testing.T) {
-	if got, want := Version.String(), "2.0.6"; got != want {
+	if got, want := Version.String(), "2.1.0"; got != want {
 		t.Errorf("Want version %s, got %s", want, got)
 	}
 }