diff --git a/.github/release.config.js b/.github/release.config.js
index 8d41936303..506092e94f 100644
--- a/.github/release.config.js
+++ b/.github/release.config.js
@@ -6,9 +6,14 @@ module.exports = {
             level: "patch",
         },
         {
-            name: "release/2.*",
+            name: "main",
             channel: "latest",
             level: "minor"
+        },
+        {
+            name: "release/2.*",
+            channel: "latest",
+            level: "patch"
         }
         // {
         //     name: "next",
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index aac0a33265..e13eadba17 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -57,8 +57,8 @@ jobs:
           GIT_CREDENTIALS: x-access-token:${{ secrets.ZOWE_ROBOT_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_PUBLISHER_TOKEN }}
-          OVSX_PAT: ${{ secrets.VSCODE_ZOWE_ROBOT_PUBLISH_TOKEN }}
-          VSCE_PAT: ${{ secrets.VSCODE_PUBLISHER_TOKEN }}
+          OVSX_PAT: ${{ secrets.VSCODE_OVSX_PUBLISHER_TOKEN }}
+          VSCE_PAT: ${{ secrets.VSCODE_VSCE_PUBLISHER_TOKEN }}
         with:
           config-dir: .github
           new-version: ${{ github.event.inputs.version }}
diff --git a/lerna.json b/lerna.json
index 8f0ca28668..12eebecc34 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.18.0-SNAPSHOT",
+  "version": "2.18.0",
   "command": {
     "version": {
       "forcePublish": true,
diff --git a/packages/eslint-plugin-zowe-explorer/CHANGELOG.md b/packages/eslint-plugin-zowe-explorer/CHANGELOG.md
index a952377053..b6736d1c24 100644
--- a/packages/eslint-plugin-zowe-explorer/CHANGELOG.md
+++ b/packages/eslint-plugin-zowe-explorer/CHANGELOG.md
@@ -2,10 +2,6 @@ All notable changes to the "eslint-plugin-zowe-explorer" package will be documen
 
 ## TBD Release
 
-### New features and enhancements
-
-### Bug fixes
-
 ## `2.17.0`
 
 ## `2.16.3`
diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md
index 79484d9740..b8446f7635 100644
--- a/packages/zowe-explorer-api/CHANGELOG.md
+++ b/packages/zowe-explorer-api/CHANGELOG.md
@@ -4,8 +4,6 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
 
 ## TBD Release
 
-### New features and enhancements
-
 ### Bug fixes
 
 - Fixed an issue where the `ZoweVsCodeExtension.updateCredentials` method could remove credentials from session when input prompt was cancelled. [#3018](https://github.com/zowe/zowe-explorer-vscode/pull/3018)
diff --git a/packages/zowe-explorer-ftp-extension/CHANGELOG.md b/packages/zowe-explorer-ftp-extension/CHANGELOG.md
index 4136996dfa..47ae4ab634 100644
--- a/packages/zowe-explorer-ftp-extension/CHANGELOG.md
+++ b/packages/zowe-explorer-ftp-extension/CHANGELOG.md
@@ -2,8 +2,6 @@ All notable changes to the "zowe-explorer-ftp-extension" extension will be docum
 
 ## TBD Release
 
-### New features and enhancements
-
 ### Bug fixes
 
 - Renamed extension to `IBM z/OS FTP for Zowe Explorer`. [#2990](https://github.com/zowe/zowe-explorer-vscode/issues/2990)
diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md
index b2eedcb40c..c72011e7c3 100644
--- a/packages/zowe-explorer/CHANGELOG.md
+++ b/packages/zowe-explorer/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 
 ### New features and enhancements
 
-- Added new Zowe Explorer z/OS Console webview with access via VS Code command pallete to issue MVS Console commands.
+- Added new Zowe Explorer z/OS Console webview with access via VS Code command pallete to issue MVS Console commands. [#2925](https://github.com/zowe/zowe-explorer-vscode/pull/2925)
 
 ### Bug fixes