diff --git a/.github/workflows/.env b/.github/workflows/.env
index 081f1c57..f061baa7 100644
--- a/.github/workflows/.env
+++ b/.github/workflows/.env
@@ -1,4 +1,4 @@
 #DRIVE_BRANCH=update-dpp
 #DAPI_BRANCH=send-metadata-buffer
-#DASHMATE_BRANCH=update-dpp
-#TEST_SUITE_BRANCH=update-dpp
\ No newline at end of file
+DASHMATE_BRANCH=v0.21-dev
+TEST_SUITE_BRANCH=v0.21-dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4747bcec..042aa9e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,41 @@
+# [7.21.0](https://github.com/dashevo/wallet-lib/compare/v7.21.0...v7.21.0) (2021-10-21)
+
+
+### Features
+
+* provide plugin dependencies sorting ([#281](https://github.com/dashevo/wallet-lib/issues/281))
+* **Keychain:** `getHardenedDIP15AccountKey`, `getDIP15ExtendedPrivateKey` ([#282](https://github.com/dashevo/wallet-lib/issues/282))
+* overridable coinbase maturity value ([#322](https://github.com/dashevo/wallet-lib/issues/322))
+* retry policy of unconfirmed transaction from stream ([#304](https://github.com/dashevo/wallet-lib/issues/304)), closes [#303](https://github.com/dashevo/wallet-lib/issues/303)
+* implement transaction metadata handling ([#291](https://github.com/dashevo/wallet-lib/issues/291), [#303](https://github.com/dashevo/wallet-lib/issues/303))
+* transaction history ([#295](https://github.com/dashevo/wallet-lib/issues/295)), closes [#303](https://github.com/dashevo/wallet-lib/issues/303)
+* **TransactionSyncWorker:** improve stream response handling ([#323](https://github.com/dashevo/wallet-lib/issues/323), [#339](https://github.com/dashevo/wallet-lib/issues/339), [#338](https://github.com/dashevo/wallet-lib/issues/338), [#336](https://github.com/dashevo/wallet-lib/issues/336))
+* prevent broadcast and throw error on transaction below min relay fee ([#305](https://github.com/dashevo/wallet-lib/issues/305))
+* provide watch-only mode for public key and address based wallet ([#290](https://github.com/dashevo/wallet-lib/issues/290))
+
+
+### Bug Fixes
+
+* logger doesn't work in the browser ([#330](https://github.com/dashevo/wallet-lib/issues/330))
+* typings fix for `waitForInstantLock` ([#289](https://github.com/dashevo/wallet-lib/issues/289))
+* correct logging of identity fetched ([#310](https://github.com/dashevo/wallet-lib/issues/310))
+* correctly announced when a plugin is initialized ([#321](https://github.com/dashevo/wallet-lib/issues/321))
+* `stream.cancel` were causing double-free and segfault ([#328](https://github.com/dashevo/wallet-lib/issues/328), [#329](https://github.com/dashevo/wallet-lib/issues/329))
+* grpc-web doesn't throw cancel error ([#332](https://github.com/dashevo/wallet-lib/issues/332))
+
+
+### Refactoring
+
+* **Keychain**: proper naming for BIP44 and DIP9 get keys methods ([#288](https://github.com/dashevo/wallet-lib/issues/288)) 
+
+
+### BREAKING CHANGES
+
+* `getHardenedBIP44Path` renamed to `getHardenedBIP44HDKey`
+* `getHardenedDIP9FeaturePath` renamed to `getHardenedDIP9FeatureHDKey`
+
+
+
 ## [7.20.1](https://github.com/dashevo/wallet-lib/compare/v7.20.0...v7.20.1) (2021-07-28)
 
 
diff --git a/package-lock.json b/package-lock.json
index 939d39a4..958ab3cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@dashevo/wallet-lib",
-  "version": "7.21.0-dev.16",
+  "version": "7.21.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@dashevo/wallet-lib",
-      "version": "7.21.0-dev.16",
+      "version": "7.21.0",
       "license": "MIT",
       "dependencies": {
         "@dashevo/dapi-client": "~0.21.2",
@@ -438,7 +438,7 @@
       "resolved": "https://registry.npmjs.org/@dashevo/dapi-client/-/dapi-client-0.21.2.tgz",
       "integrity": "sha512-4w1RmIVA7m2hXXf+GJEONIzOgHVZYYHOeAb0Bm0QbJfhSbc6gd6oJdMukaYRN4SVqqQEtNHr17ZT4iNrxAEFXg==",
       "dependencies": {
-        "@dashevo/dapi-grpc": "~0.21.0",
+        "@dashevo/dapi-grpc": "~0.21.0-dev.12",
         "@dashevo/dashcore-lib": "~0.19.26",
         "@dashevo/dpp": "~0.21.0",
         "@dashevo/grpc-common": "~0.5.4",
diff --git a/package.json b/package.json
index d2040822..b43c5b7c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/wallet-lib",
-  "version": "7.21.0-dev.16",
+  "version": "7.21.0",
   "description": "Light wallet library for Dash",
   "main": "src/index.js",
   "unpkg": "dist/wallet-lib.min.js",