diff --git a/appinfo/info.xml b/appinfo/info.xml
index a8817ab2564..e2c3cd681f6 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>21.1.10</version>
+	<version>21.1.11</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/package-lock.json b/package-lock.json
index 49acdb915fc..c7eb106c8fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "talk",
-  "version": "21.1.10",
+  "version": "21.1.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "talk",
-      "version": "21.1.10",
+      "version": "21.1.11",
       "license": "agpl",
       "dependencies": {
         "@linusborg/vue-simple-portal": "^0.1.5",
diff --git a/package.json b/package.json
index fa461db12c7..e6ea5c94779 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "21.1.10",
+  "version": "21.1.11",
   "private": true,
   "description": "",
   "license": "agpl",
diff --git a/tests/integration/features/federation/join-leave.feature b/tests/integration/features/federation/join-leave.feature
index 9f376f71505..5e3d85a5a17 100644
--- a/tests/integration/features/federation/join-leave.feature
+++ b/tests/integration/features/federation/join-leave.feature
@@ -109,6 +109,7 @@ Feature: federation/join-leave
       | federated_users | participant1@{$LOCAL_URL} | 1               | [SESSION,] |
       | users           | participant2              | 3               | []         |
 
+  @skip30
   Scenario: leave a room with the session of another user
     Given using server "REMOTE"
     And user "participant3" exists
diff --git a/tests/integration/run.sh b/tests/integration/run.sh
index 8e4c6f60c15..0869b0b02ae 100755
--- a/tests/integration/run.sh
+++ b/tests/integration/run.sh
@@ -159,6 +159,7 @@ echo ''
 echo -e "\033[0;36m#\033[0m"
 echo -e "\033[0;36m# Optimizing configuration\033[0m"
 echo -e "\033[0;36m#\033[0m"
+EXCLUDE_TAGS=''
 for OCC in occ_host occ_remote; do
 	# Disable bruteforce protection because the integration tests do trigger them
 	${OCC} config:system:set auth.bruteforce.protection.enabled --value false --type bool
@@ -170,6 +171,10 @@ for OCC in occ_host occ_remote; do
 	${OCC} config:system:set debug --value true --type bool
 	# Use faster password hashing
 	${OCC} config:system:set hashing_default_password --value=true --type=bool
+
+	# Build skip list
+	MAJOR_VERSION=$(${OCC} status | grep -Eo 'version: ([0-9]+).' | grep -Eo '[0-9]+')
+	EXCLUDE_TAGS="${EXCLUDE_TAGS} --tags=~skip${MAJOR_VERSION}"
 done
 
 # Restore default config dir to local server in case it is used from the tests
@@ -184,7 +189,8 @@ echo -e "\033[1;33m# ██╔══██╗██║   ██║██║╚
 echo -e "\033[1;33m# ██║  ██║╚██████╔╝██║ ╚████║       ██║   ███████╗███████║   ██║   ███████║\033[0m"
 echo -e "\033[1;33m# ╚═╝  ╚═╝ ╚═════╝ ╚═╝  ╚═══╝       ╚═╝   ╚══════╝╚══════╝   ╚═╝   ╚══════╝\033[0m"
 echo -e "\033[1;33m#\033[0m"
-${APP_INTEGRATION_DIR}/vendor/bin/behat --colors -f junit -f pretty $1 $2
+echo ${APP_INTEGRATION_DIR}/vendor/bin/behat --colors -f junit -f pretty ${EXCLUDE_TAGS} $1 $2
+${APP_INTEGRATION_DIR}/vendor/bin/behat --colors -f junit -f pretty ${EXCLUDE_TAGS} $1 $2
 RESULT=$?
 
 echo ''