diff --git a/appinfo/info.xml b/appinfo/info.xml
index c14f1e55460..4c5038cb317 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -18,7 +18,7 @@
 * 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.
 ]]></description>
 
-	<version>22.0.11</version>
+	<version>22.0.12</version>
 	<licence>agpl</licence>
 
 	<author>Anna Larch</author>
diff --git a/docs/changelogs/changelog-21.md b/docs/changelogs/changelog-21.md
index 8bd5831e541..b4b9a6a9f37 100644
--- a/docs/changelogs/changelog-21.md
+++ b/docs/changelogs/changelog-21.md
@@ -5,6 +5,17 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 21.1.11 – 2026-04-30
+### Changed
+- Update dependencies
+- Update translations
+
+### Fixed
+- fix(calendar): Fix calendar meeting integration after a session related change in server
+  [#17818](https://github.com/nextcloud/spreed/pull/17818)
+- fix(federation): Check session id when leaving a conversation
+  [#17866](https://github.com/nextcloud/spreed/pull/17866)
+
 ## 21.1.10 – 2026-04-02
 ### Changed
 - Update dependencies
diff --git a/docs/changelogs/changelog-22.md b/docs/changelogs/changelog-22.md
index d62fdb11f9b..a47c2fe463a 100644
--- a/docs/changelogs/changelog-22.md
+++ b/docs/changelogs/changelog-22.md
@@ -5,6 +5,39 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 22.0.12 – 2026-04-30
+### Changed
+- Update dependencies
+- Update translations
+
+### Fixed
+- fix(bots): Hide bots from apps when their app is disabled
+  [#17668](https://github.com/nextcloud/spreed/pull/17668)
+- fix(bots): Don't soft-fail when creating incompatible bots
+  [#17665](https://github.com/nextcloud/spreed/pull/17665)
+- fix(calendar): Make appointment conversations meetings so they expire after the appointment
+  [#17646](https://github.com/nextcloud/spreed/pull/17646)
+- fix(call): Fix joining the conversation with breakout rooms or extending 1-1
+  [#17785](https://github.com/nextcloud/spreed/pull/17785)
+  [#17710](https://github.com/nextcloud/spreed/pull/17710)
+  [#17779](https://github.com/nextcloud/spreed/pull/17779)
+- fix(chat): Improve "language detection" option in the translation dialogue
+  [#17677](https://github.com/nextcloud/spreed/pull/17677)
+- fix(commands): Correctly exclude only 1-1 from managing via occ
+  [#17740](https://github.com/nextcloud/spreed/pull/17740)
+- fix(conversation): Show filtered conversations right away when searching
+  [#17841](https://github.com/nextcloud/spreed/pull/17841)
+- fix(conversation): Make conversation order consistent when searching
+  [#17658](https://github.com/nextcloud/spreed/pull/17658)
+- fix(conversation): Gracefully handle cases when the conversation list is too big for the browser storage
+  [#17650](https://github.com/nextcloud/spreed/pull/17650)
+- fix(federation): Check session id when leaving a conversation
+  [#17867](https://github.com/nextcloud/spreed/pull/17867)
+- fix(recording): Allow MP4 as recording mimetype
+  [#17648](https://github.com/nextcloud/spreed/pull/17648)
+- fix(transcriptions): Fix live transcription app getting the signaling settings
+  [#17739](https://github.com/nextcloud/spreed/pull/17739)
+
 ## 22.0.11 – 2026-04-02
 ### Changed
 - Update dependencies
diff --git a/package-lock.json b/package-lock.json
index 893fb037cc8..29b87814922 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "talk",
-  "version": "22.0.11",
+  "version": "22.0.12",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "talk",
-      "version": "22.0.11",
+      "version": "22.0.12",
       "license": "agpl",
       "dependencies": {
         "@matrix-org/olm": "^3.2.15",
diff --git a/package.json b/package.json
index a857220940c..e3b1d381073 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "22.0.11",
+  "version": "22.0.12",
   "private": true,
   "description": "",
   "license": "agpl",