diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst
index f24603c732d..54f84aa26bc 100644
--- a/src/azure-cli-core/HISTORY.rst
+++ b/src/azure-cli-core/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.2.0
+++++++
+* az cloud show: add application insights endpoint for China/US cloud
+
 2.1.0
 ++++++
 * Support `--output yamlc` for colorized YAML
diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py
index 8a701e8b367..b4ab074a924 100644
--- a/src/azure-cli-core/azure/cli/core/__init__.py
+++ b/src/azure-cli-core/azure/cli/core/__init__.py
@@ -4,7 +4,7 @@
 # --------------------------------------------------------------------------------------------
 from __future__ import print_function
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 
 import os
 import sys
diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py
index bb4e6dbb5e5..66a971dcfcd 100644
--- a/src/azure-cli-core/setup.py
+++ b/src/azure-cli-core/setup.py
@@ -17,7 +17,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.1.0"
+VERSION = "2.2.0"
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
 try:
diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 7530e03a792..7a20630928c 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -3,10 +3,129 @@
 Release History
 ===============
 
+2.2.0
+++++++
+
+**ACR**
+
+* Fix: `az acr login` wrongly raise error
+* Add new command `az acr helm install-cli`
+* Add private link and CMK support
+* add 'private-link-resource list' command
+
+**AKS**
+
+* fix the aks browse in cloud shell
+* az aks: Fix monitoring addon and agentpool NoneType errors
+* Add --nodepool-tags to node pool when creating azure kubernetes cluster
+* Add --tags when adding or updating a nodepool to cluster
+* aks create: add `--enable-private-cluster`
+* add --nodepool-labels when creating azure kubernetes cluster
+* add --labels when adding a new nodepool to azure kubernetes cluster
+* add missing / in the dashboard url
+* Support create aks clusters enabling managed identity
+* az aks: Validate network plugin to be either "azure" or "kubenet"
+* az aks: Add aad session key support
+* [BREAKING CHANGE] az aks: support msi changes for GF and BF for omsagent (Container monitoring)(#1)
+* az aks use-dev-spaces: Adding endpoint type option to the use-dev-spaces command to customize the endpoint created on an Azure Dev Spaces controller
+
+**AppConfig**
+
+* Unblock using "kv set" to add keyvault reference and feature …
+
 **AppService**
 
-* functionapp: Fix an issue when using `az functionapp deployment source config-zip` to deploy on Linux app service / premium plan causing 5xx error
-* az webapp create : Fixing issue when running the command with --runtime 
+* az webapp create : Fix issue when running the command with --runtime
+* az functionapp deployment source config-zip: Add an error message if resource group or function name are invalid/don't exist
+* functionapp create: Fix the warning message that appears with `functionapp create` today which cites a `--functions_version` flag but erroneously uses a `_` instead of a `-` in the flag name
+* az functionapp create: Updated the way linuxFxVersion and container image name were being set for linux function apps
+* az functionapp deployment source config-zip: Fix an issue caused by app settings change racing condition during zip deploy, giving 5xx errors during deployment
+* Fix #5720946: az webapp backup fails to set name
+
+**ARM**
+
+* az resource: Improve the examples of the resource module
+* az policy assignment list: Support listing policy assignments at Management Group scope
+* Add `az deployment group` and `az deployment operation group` for template deployment at resource groups. This is a duplicate of `az group deployment` and `az group deployment operation`
+* Add `az deployment sub` and `az deployment operation sub` for template deployment at subscription scope. This is a duplicate of `az deployment` and `az deployment operation`
+* Add `az deployment mg` and `az deployment operation mg` for template deployment at management groups
+* Add `az deployment tenant` and `az deployment operation tenant` for template deployment at tenant scope
+* az policy assignment create: Add a description to the `--location` parameter
+* az group deployment create: Add parameter `--aux-tenants` to support cross tenants
+
+**CDN**
+
+* Add CDN WAF commands
+
+**Compute**
+
+* az sig image-version: add --data-snapshot-luns
+* az ppg show: add --colocation-status to enable fetching the colocation status of all the resources in the proximity placement group
+* az vmss create/update: support automatic repairs
+* [BREAKING CHANGE] az image template: rename template to builder
+* az image builder create: add --image-template
+
+**Cosmos DB**
+
+* Add Sql stored procedure, udf and trigger cmdlets
+* az cosmosdb create: add --key-uri to support adding key vault encryption information
+
+**KeyVault**
+
+* keyvault create: enable soft-delete by default
+
+**Monitor**
+
+* az monitor metrics alert create: support `~` in `--condition`
+
+**Network**
+
+* az network application-gateway rewrite-rule create: support url configuration
+* az network dns zone import: --zone-name will be case insensitive in the future
+* az network private-endpoint/private-link-service: remove preview label
+* az network bastion: support bastion
+* az network vnet list-available-ips: support list available ips in a vnet
+* az network watcher flow-log create/list/delete/update: add new commands to manage watcher flow log and exposing --location to identify watcher explicitly
+* az network watcher flow-log configure: deprecated
+* az network watcher flow-log show: support --location and --name to get ARM-formatted result, deprecated old formatted output
+
+**Policy**
+
+* az policy assignment create: Fix the bug that automatically generated name of policy assignment exceeds the limit
+
+**RBAC**
+
+* az ad group show: fix --group value treated as regex problem
+
+**RDBMS**
+
+* Bump the azure-mgmt-rdbms SDK version to 2.0.0
+* az postgres private-endpoint-connection: manage postgres private endpoint connections
+* az postgres private-link-resource: manage postgres private link resources
+* az mysql private-endpoint-connection: manage mysql private endpoint connections
+* az mysql private-link-resource: manage mysql private link resources
+* az mariadb private-endpoint-connection: manage mariadb private endpoint connections
+* az mariadb private-link-resource: manage mariadb private link resources
+* Updating RDBMS Private Endpoint Tests
+
+**SQL**
+
+* Sql midb Add: list-deleted, show-deleted, update-retention, show-retention
+* (sql server create:) Add optional public-network-access 'Enable'/'Disable' flag to sql server create
+* (sql server update:) make some customer-facing change
+* Add minimal_tls_version property for MI and SQL DB
+
+**Storage**
+
+* az storage blob delete-batch: Misbehaving `--dryrun` flag
+* az storage account network-rule add (bug fix): add operation should be idempotent
+* az storage account create/update: Add Routing Preference support
+* Upgrade azure-mgmt-storage version to 8.0.0
+* az storage container immutability create: add --allow-protected-append-write parameter
+* az storage account private-link-resource list: Add support to list private link resources for storage account
+* az storage account private-endpoint-connection approve/reject/show/delete: Support to manage private endpoint connections
+* az storage account blob-service-properties update: add --enable-restore-policy and --restore-days
+* az storage blob restore: Add support to restore blob ranges
 
 2.1.0
 ++++++
@@ -113,8 +232,6 @@ Release History
 **AKS**
 
 * Each cluster gets a separate service principal to improve isolation
-* Add --nodepool-tags to node pool when creating azure kubernetes cluster
-* Add --tags when adding or updating a nodepool to cluster
 
 **AppConfig**
 
diff --git a/src/azure-cli/azure/cli/__init__.py b/src/azure-cli/azure/cli/__init__.py
index 03821fd78a3..1db6ef4f4d0 100644
--- a/src/azure-cli/azure/cli/__init__.py
+++ b/src/azure-cli/azure/cli/__init__.py
@@ -11,4 +11,4 @@
 pkg_resources.declare_namespace(__name__)
 
 __author__ = "Microsoft Corporation <python@microsoft.com>"
-__version__ = "2.1.0"
+__version__ = "2.2.0"
diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt
index 6799b341ede..ee573a1116a 100644
--- a/src/azure-cli/requirements.py3.Darwin.txt
+++ b/src/azure-cli/requirements.py3.Darwin.txt
@@ -4,9 +4,9 @@ applicationinsights==0.11.9
 argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-batch==8.0.0
-azure-cli==2.1.0
+azure-cli==2.2.0
 azure-cli-command-modules-nspkg==2.0.3
-azure-cli-core==2.1.0
+azure-cli-core==2.2.0
 azure-cli-nspkg==3.0.4
 azure-cli-telemetry==1.0.4
 azure-common==1.1.22
diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt
index 6799b341ede..ee573a1116a 100644
--- a/src/azure-cli/requirements.py3.Linux.txt
+++ b/src/azure-cli/requirements.py3.Linux.txt
@@ -4,9 +4,9 @@ applicationinsights==0.11.9
 argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-batch==8.0.0
-azure-cli==2.1.0
+azure-cli==2.2.0
 azure-cli-command-modules-nspkg==2.0.3
-azure-cli-core==2.1.0
+azure-cli-core==2.2.0
 azure-cli-nspkg==3.0.4
 azure-cli-telemetry==1.0.4
 azure-common==1.1.22
diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt
index f19aa34f3c3..584970a9ae5 100644
--- a/src/azure-cli/requirements.py3.windows.txt
+++ b/src/azure-cli/requirements.py3.windows.txt
@@ -4,9 +4,9 @@ applicationinsights==0.11.7
 argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-batch==8.0.0
-azure-cli==2.1.0
+azure-cli==2.2.0
 azure-cli-command-modules-nspkg==2.0.3
-azure-cli-core==2.1.0
+azure-cli-core==2.2.0
 azure-cli-nspkg==3.0.4
 azure-cli-telemetry==1.0.4
 azure-common==1.1.22
diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py
index d2a6830f148..704c969d73d 100644
--- a/src/azure-cli/setup.py
+++ b/src/azure-cli/setup.py
@@ -18,7 +18,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.1.0"
+VERSION = "2.2.0"
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
 try: