diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bf90505..c806738e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # Change Log
+## 1.18.0
+### Added
+* Support multiple plans for marketplace
+
+### Changed
+* Optimize ASA retry logic
+
 ## 1.17.0 - 2019-08-29
 ### Added
 * Add CodeLens to help user update ASA job information
diff --git a/README.md b/README.md
index 1d0f76f4..186bcd0c 100644
--- a/README.md
+++ b/README.md
@@ -20,12 +20,12 @@
 
 ![Added](images/multipleplatform.gif)
 
-## What's New (v1.17.0)
+## What's New (v1.18.0)
 ### Added
-* Add CodeLens to help user update ASA job information.
+* Support multiple plans for marketplace
 
-### Fixed
-* Fix broken link in README.md.
+### Changed
+* Optimize ASA retry logic
 
 ## Known Issues
 * [C module remote debug error](https://github.com/Microsoft/vscode-azure-iot-edge/issues/283)
diff --git a/package.json b/package.json
index 6c67beaf..5bf22abb 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "azure-iot-edge",
   "displayName": "Azure IoT Edge",
   "description": "Develop, deploy, debug, and manage your IoT Edge solution",
-  "version": "1.17.0",
+  "version": "1.18.0-rc",
   "publisher": "vsciot-vscode",
   "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe",
   "icon": "logo.png",