diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2949e8cca..95b647b0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,33 @@
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 2.18.0
+
+([Full Changelog](https://github.com/jupyterlab/jupyter-ai/compare/@jupyter-ai/core@2.17.0...698ee8e5994da2b9af3cef90396cf9ed5fd65064))
+
+### Enhancements made
+
+- Add new Cohere models [#834](https://github.com/jupyterlab/jupyter-ai/pull/834) ([@srdas](https://github.com/srdas))
+- Group messages with their replies [#832](https://github.com/jupyterlab/jupyter-ai/pull/832) ([@michaelchia](https://github.com/michaelchia))
+- Support Notebook 7 [#827](https://github.com/jupyterlab/jupyter-ai/pull/827) ([@jtpio](https://github.com/jtpio))
+- Support pending/loading message while waiting for response [#821](https://github.com/jupyterlab/jupyter-ai/pull/821) ([@michaelchia](https://github.com/michaelchia))
+
+### Bugs fixed
+
+- Fix compatibility with Python 3.8 [#844](https://github.com/jupyterlab/jupyter-ai/pull/844) ([@krassowski](https://github.com/krassowski))
+
+### Documentation improvements
+
+- Updates end of maintenance messaging to be in the past tense [#843](https://github.com/jupyterlab/jupyter-ai/pull/843) ([@JasonWeill](https://github.com/JasonWeill))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyterlab/jupyter-ai/graphs/contributors?from=2024-06-12&to=2024-06-19&type=c))
+
+[@dlqqq](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Adlqqq+updated%3A2024-06-12..2024-06-19&type=Issues) | [@JasonWeill](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3AJasonWeill+updated%3A2024-06-12..2024-06-19&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Ajtpio+updated%3A2024-06-12..2024-06-19&type=Issues) | [@krassowski](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Akrassowski+updated%3A2024-06-12..2024-06-19&type=Issues) | [@michaelchia](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Amichaelchia+updated%3A2024-06-12..2024-06-19&type=Issues) | [@srdas](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Asrdas+updated%3A2024-06-12..2024-06-19&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
 ## 2.17.0
 
 ([Full Changelog](https://github.com/jupyterlab/jupyter-ai/compare/@jupyter-ai/core@2.16.0...ff7bd1a7a538b36464487e8a856af5347a3dabcc))
@@ -34,8 +61,6 @@
 
 [@dlqqq](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Adlqqq+updated%3A2024-05-20..2024-06-12&type=Issues) | [@JasonWeill](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3AJasonWeill+updated%3A2024-05-20..2024-06-12&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Ajtpio+updated%3A2024-05-20..2024-06-12&type=Issues) | [@krassowski](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Akrassowski+updated%3A2024-05-20..2024-06-12&type=Issues) | [@srdas](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Asrdas+updated%3A2024-05-20..2024-06-12&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 2.16.0
 
 ([Full Changelog](https://github.com/jupyterlab/jupyter-ai/compare/@jupyter-ai/core@2.15.0...e41cebf3ef137509d43ef6e54703c47c7e3d7a22))
diff --git a/lerna.json b/lerna.json
index 9cd51026e..63508898f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,7 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useWorkspaces": true,
-  "version": "2.17.0",
+  "version": "2.18.0",
   "npmClient": "yarn",
   "useNx": true
 }
diff --git a/package.json b/package.json
index 799dfdbf1..ddc537cb9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-ai/monorepo",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "A generative AI extension for JupyterLab",
   "private": true,
   "keywords": [
diff --git a/packages/jupyter-ai-magics/package.json b/packages/jupyter-ai-magics/package.json
index 97a3a73ae..b1936ecc6 100644
--- a/packages/jupyter-ai-magics/package.json
+++ b/packages/jupyter-ai-magics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-ai/magics",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Jupyter AI magics Python package. Not published on NPM.",
   "private": true,
   "homepage": "https://github.com/jupyterlab/jupyter-ai",
diff --git a/packages/jupyter-ai/package.json b/packages/jupyter-ai/package.json
index 9e9b27e7a..bb0e34d9a 100644
--- a/packages/jupyter-ai/package.json
+++ b/packages/jupyter-ai/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-ai/core",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "A generative AI extension for JupyterLab",
   "keywords": [
     "jupyter",