diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65edff82abb..8ff46d58f37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,26 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 18.0.9 – 2024-06-27
+### Fixed
+- fix(bots): Fix bots with self-signed certificates
+  [#12470](https://github.com/nextcloud/spreed/pull/12470)
+- fix(attachments): Fix creating new files from templates
+  [#12487](https://github.com/nextcloud/spreed/pull/12487)
+- fix(shareIntegration): Fix handle to close and open the right sidebar on publish share links
+  [#12494](https://github.com/nextcloud/spreed/pull/12494)
+- fix(bots): Show error messages during bots setup
+  [#12573](https://github.com/nextcloud/spreed/pull/12573)
+- fix(chat): Adjust toast message on message deletion
+  [#12588](https://github.com/nextcloud/spreed/pull/12588)
+
+## 17.1.10 – 2024-06-27
+### Fixed
+- fix(bots): Fix bots with self-signed certificates
+  [#12469](https://github.com/nextcloud/spreed/pull/12469)
+- fix(shareIntegration): Fix handle to close and open the right sidebar on publish share links
+  [#12495](https://github.com/nextcloud/spreed/pull/12495)
+
 ## 18.0.8 – 2024-05-23
 ### Fixed
 - fix(polls): Remove actor info from system message
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 3a0271b599a..1594b4f11b1 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,7 +16,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m
 
 	]]></description>
 
-	<version>18.0.8</version>
+	<version>18.0.9</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>
diff --git a/package-lock.json b/package-lock.json
index f25c7827709..042812518b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "talk",
-  "version": "18.0.8",
+  "version": "18.0.9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "talk",
-      "version": "18.0.8",
+      "version": "18.0.9",
       "license": "agpl",
       "dependencies": {
         "@linusborg/vue-simple-portal": "^0.1.5",
diff --git a/package.json b/package.json
index ab425c8c954..be013f8d4f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "18.0.8",
+  "version": "18.0.9",
   "private": true,
   "description": "",
   "author": "Joas Schilling <coding@schilljs.com>",