diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ac26ad2..4a08dc11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,32 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.18.0
+### Added
+- ℹ️ Prepare for the [upcoming usage-based billing](https://github.blog/news-insights/company-news/github-copilot-is-moving-to-usage-based-billing/). We strongly recommend upgrading to this version as soon as possible. [#203](https://github.com/microsoft/copilot-for-eclipse/issues/203)
+- Add Copilot preference for a chat's custom instructions loading. [#62](https://github.com/microsoft/copilot-for-eclipse/issues/62), contributed by [@travkin79](https://github.com/travkin79)
+- Support skills and prompt files. [PR#133](https://github.com/microsoft/copilot-for-eclipse/pull/133)
+- Support displaying thinking blocks in chat view. [#202](https://github.com/microsoft/copilot-for-eclipse/issues/202)
+- Support selecting thinking effort for model. [#204](https://github.com/microsoft/copilot-for-eclipse/issues/204)
+
+### Fixed
+- Cannot fall back to JS-based CLS when native binary fails to start. [#116](https://github.com/microsoft/copilot-for-eclipse/issues/116)
+- 400 Bad Request when restoring conversation from persistence. [#131](https://github.com/microsoft/copilot-for-eclipse/issues/131)
+- Tool call errors failed to render in chat view. [PR#145](https://github.com/microsoft/copilot-for-eclipse/pull/145)
+- BYOK display name label should be optional. [PR#158](https://github.com/microsoft/copilot-for-eclipse/pull/158)
+- Subagent progress events leak into unrelated conversation UI when switching sessions. [#160](https://github.com/microsoft/copilot-for-eclipse/issues/160)
+- Integrate CLS session persistence and restoration for conversation history. [PR#161](https://github.com/microsoft/copilot-for-eclipse/pull/161)
+- Subagent turns appear as separate assistant messages after restoration. [#163](https://github.com/microsoft/copilot-for-eclipse/issues/163)
+- UI freeze: caused by deadlock in EditorsManager. [#175](https://github.com/microsoft/copilot-for-eclipse/issues/175)
+- UI freeze: deadlock between main thread and LSP listener on quota fallback. [#179](https://github.com/microsoft/copilot-for-eclipse/issues/179)
+- The mode picker will be blank in preference page when workspace contains 'remote' FS project. [#180](https://github.com/microsoft/copilot-for-eclipse/issues/180)
+- Prevent focusing the Terminal view after executing a CLI command in Chat view. [#188](https://github.com/microsoft/copilot-for-eclipse/issues/188), contributed by [@rsd-darshan](https://github.com/rsd-darshan)
+
+### Engineering
+- Extend CONTRIBUTING.md and adapt some Eclipse project settings to simplify getting started. [PR#176](https://github.com/microsoft/copilot-for-eclipse/pull/176), contributed by [@travkin79](https://github.com/travkin79)
+- Add explicit least-privilege permissions to CI workflow. [PR#185](https://github.com/microsoft/copilot-for-eclipse/pull/185), contributed by [@arpitjain099](https://github.com/arpitjain099)
+
+
 ## 0.17.0
 ### Added
 - Add context size donut and popup for visualizing token usage.
diff --git a/com.microsoft.copilot.eclipse.branding/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.branding/META-INF/MANIFEST.MF
index d6870ee6..16926659 100644
--- a/com.microsoft.copilot.eclipse.branding/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.branding/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GitHub Copilot
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.branding;singleton:=true
-Bundle-Version: 0.17.0.qualifier
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Automatic-Module-Name: com.microsoft.copilot.eclipse.branding
diff --git a/com.microsoft.copilot.eclipse.core.agent.linux.aarch64/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.linux.aarch64/META-INF/MANIFEST.MF
index f78b312f..919f4b2b 100644
--- a/com.microsoft.copilot.eclipse.core.agent.linux.aarch64/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core.agent.linux.aarch64/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.copilot.eclipse.core.agent.linux.aarch64
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.core.agent.linux.aarch64
-Automatic-Module-NAME: com.microsoft.copilot.eclipse.core.agent.linux.aarch64
-Bundle-Version: 0.17.0.qualifier
+Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.linux.aarch64
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Fragment-Host: com.microsoft.copilot.eclipse.core
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/com.microsoft.copilot.eclipse.core.agent.linux.x64/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.linux.x64/META-INF/MANIFEST.MF
index 58631d5f..d0590971 100644
--- a/com.microsoft.copilot.eclipse.core.agent.linux.x64/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core.agent.linux.x64/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.copilot.eclipse.core.agent.linux.x64
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.core.agent.linux.x64
-Automatic-Module-NAME: com.microsoft.copilot.eclipse.core.agent.linux.x64
-Bundle-Version: 0.17.0.qualifier
+Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.linux.x64
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Fragment-Host: com.microsoft.copilot.eclipse.core
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/com.microsoft.copilot.eclipse.core.agent.macosx.aarch64/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.macosx.aarch64/META-INF/MANIFEST.MF
index 0e8f77d0..14320936 100644
--- a/com.microsoft.copilot.eclipse.core.agent.macosx.aarch64/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core.agent.macosx.aarch64/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.copilot.eclipse.core.agent.macosx.aarch64
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.core.agent.macosx.aarch64
-Automatic-Module-NAME: com.microsoft.copilot.eclipse.core.agent.macosx.aarch64
-Bundle-Version: 0.17.0.qualifier
+Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.macosx.aarch64
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Fragment-Host: com.microsoft.copilot.eclipse.core
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/com.microsoft.copilot.eclipse.core.agent.macosx.x64/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.macosx.x64/META-INF/MANIFEST.MF
index d626aba5..1b554a64 100644
--- a/com.microsoft.copilot.eclipse.core.agent.macosx.x64/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core.agent.macosx.x64/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.copilot.eclipse.core.agent.macosx.x64
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.core.agent.macosx.x64
-Automatic-Module-NAME: com.microsoft.copilot.eclipse.core.agent.macosx.x64
-Bundle-Version: 0.17.0.qualifier
+Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.macosx.x64
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Fragment-Host: com.microsoft.copilot.eclipse.core
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/com.microsoft.copilot.eclipse.core.agent.win32/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.win32/META-INF/MANIFEST.MF
index 23064085..69cc83a5 100644
--- a/com.microsoft.copilot.eclipse.core.agent.win32/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core.agent.win32/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.copilot.eclipse.core.agent.win32
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.core.agent.win32
-Automatic-Module-NAME: com.microsoft.copilot.eclipse.core.agent.win32
-Bundle-Version: 0.17.0.qualifier
+Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.win32
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Fragment-Host: com.microsoft.copilot.eclipse.core
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/com.microsoft.copilot.eclipse.core.test/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.test/META-INF/MANIFEST.MF
index 7921c7c4..583fef61 100644
--- a/com.microsoft.copilot.eclipse.core.test/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.copilot.eclipse.core.test
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.core.test;singleton:=true
-Bundle-Version: 0.17.0.qualifier
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Fragment-Host: com.microsoft.copilot.eclipse.core
diff --git a/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF
index d21e427a..f5a193f2 100644
--- a/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.copilot.eclipse.core
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.core;singleton:=true
-Bundle-Version: 0.17.0.qualifier
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Export-Package: com.microsoft.copilot.eclipse.core,
  com.microsoft.copilot.eclipse.core.chat,
diff --git a/com.microsoft.copilot.eclipse.feature/feature.xml b/com.microsoft.copilot.eclipse.feature/feature.xml
index 5fa91942..a9f0b117 100644
--- a/com.microsoft.copilot.eclipse.feature/feature.xml
+++ b/com.microsoft.copilot.eclipse.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.microsoft.copilot.eclipse.feature"
       label="GitHub Copilot"
-      version="0.17.0.qualifier"
+      version="0.18.0.qualifier"
       provider-name="GitHub Copilot"
       plugin="com.microsoft.copilot.eclipse.branding">
 
diff --git a/com.microsoft.copilot.eclipse.repository/category.xml b/com.microsoft.copilot.eclipse.repository/category.xml
index 53845b35..b9b1f538 100644
--- a/com.microsoft.copilot.eclipse.repository/category.xml
+++ b/com.microsoft.copilot.eclipse.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="com.microsoft.copilot.eclipse.feature" version="0.17.0.qualifier">
+   <feature id="com.microsoft.copilot.eclipse.feature" version="0.18.0.qualifier">
       <category name="com.microsoft.copilot.eclipse.category"/>
    </feature>
    <category-def name="com.microsoft.copilot.eclipse.category" label="GitHub Copilot"/>
diff --git a/com.microsoft.copilot.eclipse.swtbot.test/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.swtbot.test/META-INF/MANIFEST.MF
index ac5e280e..9ccba384 100644
--- a/com.microsoft.copilot.eclipse.swtbot.test/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.swtbot.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.copilot.eclipse.swtbot.test
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.swtbot.test;singleton:=true
-Bundle-Version: 0.17.0.qualifier
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: com.microsoft.copilot.eclipse.swtbot.test
diff --git a/com.microsoft.copilot.eclipse.terminal.api/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.terminal.api/META-INF/MANIFEST.MF
index 469ca4c9..b6fe125a 100644
--- a/com.microsoft.copilot.eclipse.terminal.api/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.terminal.api/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.copilot.eclipse.terminal.api
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.terminal.api;singleton:=true
-Bundle-Version: 0.17.0.qualifier
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Export-Package: com.microsoft.copilot.eclipse.terminal.api
 Automatic-Module-Name: com.microsoft.copilot.eclipse.terminal.api
diff --git a/com.microsoft.copilot.eclipse.ui.jobs/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.jobs/META-INF/MANIFEST.MF
index 447bf799..c9af90e7 100644
--- a/com.microsoft.copilot.eclipse.ui.jobs/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.ui.jobs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GitHub Copilot Jobs
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.jobs;singleton:=true
-Bundle-Version: 0.17.0.qualifier
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Bundle-Activator: com.microsoft.copilot.eclipse.ui.jobs.CopilotJobs
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/com.microsoft.copilot.eclipse.ui.terminal.tm/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.terminal.tm/META-INF/MANIFEST.MF
index 41b6b38b..76d94d69 100644
--- a/com.microsoft.copilot.eclipse.ui.terminal.tm/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.ui.terminal.tm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.copilot.eclipse.ui.terminal.tm
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.terminal.tm;singleton:=true
-Bundle-Version: 0.17.0.qualifier
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.terminal.tm
diff --git a/com.microsoft.copilot.eclipse.ui.terminal/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.terminal/META-INF/MANIFEST.MF
index 553e994a..bca04bbc 100644
--- a/com.microsoft.copilot.eclipse.ui.terminal/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.ui.terminal/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.copilot.eclipse.ui.terminal
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.terminal;singleton:=true
-Bundle-Version: 0.17.0.qualifier
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.terminal
diff --git a/com.microsoft.copilot.eclipse.ui.test/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.test/META-INF/MANIFEST.MF
index 6470013f..763af993 100644
--- a/com.microsoft.copilot.eclipse.ui.test/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.copilot.eclipse.ui.test
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.test;singleton:=true
-Bundle-Version: 0.17.0.qualifier
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.test
diff --git a/com.microsoft.copilot.eclipse.ui/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui/META-INF/MANIFEST.MF
index 0778e096..2a91ad85 100644
--- a/com.microsoft.copilot.eclipse.ui/META-INF/MANIFEST.MF
+++ b/com.microsoft.copilot.eclipse.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.microsoft.copilot.eclipse.ui
 Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui;singleton:=true
-Bundle-Version: 0.17.0.qualifier
+Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: GitHub Copilot
 Bundle-Localization: plugin
 Export-Package: com.microsoft.copilot.eclipse.ui,
diff --git a/pom.xml b/pom.xml
index c385e8c7..b49c8076 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<name>${base.name}</name>
 
 	<properties>
-		<copilot-plugin-version>0.17.0-SNAPSHOT</copilot-plugin-version>
+		<copilot-plugin-version>0.18.0-SNAPSHOT</copilot-plugin-version>
 		<base.name>GitHub Copilot</base.name>
 		<tycho-version>4.0.13</tycho-version>
 		<checkstyle-version>3.6.0</checkstyle-version>