diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst
index 2a7406ee7f3..5a83d31dde6 100644
--- a/src/azure-cli-core/HISTORY.rst
+++ b/src/azure-cli-core/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.18.0
+++++++
+* Print INFO log from SDK (#15676)
+
 2.17.1
 ++++++
 * No changes
diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py
index 81fd700d7a3..977852ad343 100644
--- a/src/azure-cli-core/azure/cli/core/__init__.py
+++ b/src/azure-cli-core/azure/cli/core/__init__.py
@@ -6,7 +6,7 @@
 
 from __future__ import print_function
 
-__version__ = "2.17.1"
+__version__ = "2.18.0"
 
 import os
 import sys
diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py
index ea3f70b7f00..4757b38048f 100644
--- a/src/azure-cli-core/setup.py
+++ b/src/azure-cli-core/setup.py
@@ -9,7 +9,7 @@
 from codecs import open
 from setuptools import setup, find_packages
 
-VERSION = "2.17.1"
+VERSION = "2.18.0"
 
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 785fc395134..8041d9d2ee2 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -3,6 +3,72 @@
 Release History
 ===============
 
+2.18.0
+++++++
+
+**ACR**
+
+* `az acr create / update`: Add `--allow-trusted-services`. This parameter determines whether trusted azure services are allowed to access network restricted registries. The default is to allow. (#16530)
+
+**AKS**
+
+* `az aks check-acr`: Add new check-acr command (#16490)
+
+**App Service**
+
+* Fix #13907: `az webapp config ssl import`: Change command to also import App Service Certificate (#16320)
+* Fix #16125: `az webapp ssh`: If using a windows client, open browser to scm link (#16432)
+* Fix #13291: `az webapp deployment slot swap`: The command should support preserve vnet. (#16424)
+* [BREAKING CHANGE] Fix regression where you can't use a runtime version with a space in the name (#16528)
+
+**ARM**
+
+* `az deployment` : Add support for `--query-string` (#16447)
+* `az ts`: Error handling improvement for `--template-file` without `--version` prohibited (#16446)
+
+**Backup**
+
+* `az backup protection backup-now`: Set default retention period to 30 days (#16500)
+
+**Compute**
+
+* Fix issue of none storage_profile (#16260)
+* Better error handling of external tokens (#16406)
+* Fix a vmss reimage issue (#16483)
+* `az vm/vmss extension set`: New parameter `--enable-auto-upgrade` (#16243)
+
+**Container**
+
+* `az container exec`: Remove eol check to avoid closing terminal before it even started on linux (#16000)
+
+**DMS**
+
+* `az dms project task create`: Added task type parameter to help distinguish if a scenario is an online migration or an offline migration. (#15746)
+* `az dms project task cutover`: Add new command which allows tasks with an online migration task type to cutover and end the migration. (#15746)
+* `az dms project create/az dms project task create`: Enable MySQL and PostgreSQL projects/tasks to be created. (#15746)
+
+**IoT**
+
+* Add --tags to IoT Hub create and update (#16336)
+
+**Monitor**
+
+* [BREAKING CHANGE] `az monitor log-analytics workspace data-export`: Remove deprecated `--export-all-tables` parameter and require `--tables` parameter (#16402)
+
+**RDBMS**
+
+* Remove the preview tag for server key and ad admin commands for Postgres and MySql (#16412)
+
+**Role**
+
+* Fix #11594: `az role assignment create`: Only show supported values for `--assignee-principal-type` (#16056)
+
+**Storage**
+
+* Fix #16072: Upload file with big size (#16372)
+* Fix #12291: `az storage blob generate-sas` does not properly encode `--full-uri` (#15748)
+* GA PITR and blob service properties in SRP (#16540)
+
 2.17.1
 ++++++
 
diff --git a/src/azure-cli/azure/cli/__main__.py b/src/azure-cli/azure/cli/__main__.py
index 4f8dc58ff1e..54b3bbb4e42 100644
--- a/src/azure-cli/azure/cli/__main__.py
+++ b/src/azure-cli/azure/cli/__main__.py
@@ -17,7 +17,7 @@
 from knack.log import get_logger
 
 __author__ = "Microsoft Corporation <python@microsoft.com>"
-__version__ = "2.17.1"
+__version__ = "2.18.0"
 
 
 # A workaround for https://bugs.python.org/issue32502 (https://github.com/Azure/azure-cli/issues/5184)
diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt
index c1a865be084..87586848081 100644
--- a/src/azure-cli/requirements.py3.Darwin.txt
+++ b/src/azure-cli/requirements.py3.Darwin.txt
@@ -5,8 +5,8 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==10.0.0
-azure-cli==2.17.1
-azure-cli-core==2.17.1
+azure-cli==2.18.0
+azure-cli-core==2.18.0
 azure-cli-telemetry==1.0.6
 azure-common==1.1.22
 azure-cosmos==3.2.0
diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt
index c1a865be084..87586848081 100644
--- a/src/azure-cli/requirements.py3.Linux.txt
+++ b/src/azure-cli/requirements.py3.Linux.txt
@@ -5,8 +5,8 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==10.0.0
-azure-cli==2.17.1
-azure-cli-core==2.17.1
+azure-cli==2.18.0
+azure-cli-core==2.18.0
 azure-cli-telemetry==1.0.6
 azure-common==1.1.22
 azure-cosmos==3.2.0
diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt
index 12b3cf2cc68..ba5f14f10ef 100644
--- a/src/azure-cli/requirements.py3.windows.txt
+++ b/src/azure-cli/requirements.py3.windows.txt
@@ -5,8 +5,8 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==10.0.0
-azure-cli==2.17.1
-azure-cli-core==2.17.1
+azure-cli==2.18.0
+azure-cli-core==2.18.0
 azure-cli-telemetry==1.0.6
 azure-common==1.1.22
 azure-cosmos==3.2.0
diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py
index b5f2a8764de..97ea20967d7 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.17.1"
+VERSION = "2.18.0"
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
 try: