diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 7b523d51b6..69fb09a3f5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -38,6 +38,12 @@ jobs:
               with:
                   persist-credentials: false
 
+            - uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+            - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+              with:
+                  cache: "pnpm"
+                  node-version-file: package.json
+
             - name: Load GPG key
               run: |
                   curl https://packages.element.io/element-release-key.gpg | gpg --import
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bdbf69f68..56273ce561 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+Changes in [1.12.21](https://github.com/element-hq/element-web/releases/tag/v1.12.21) (2026-06-09)
+==================================================================================================
+## ✨ Features
+
+* Bump module API to 1.14.0 ([#33685](https://github.com/element-hq/element-web/pull/33685)). Contributed by @Half-Shot.
+* Apply new design and display logic to logout confirmation dialog ([#33426](https://github.com/element-hq/element-web/pull/33426)). Contributed by @uhoreg.
+* Room list: improve custom sections in Spaces  ([#33523](https://github.com/element-hq/element-web/pull/33523)). Contributed by @florianduros.
+* Periodically nag the user if their device remains unverified ([#33346](https://github.com/element-hq/element-web/pull/33346)). Contributed by @uhoreg.
+* Use the separator as border between roomlist and main panel ([#33598](https://github.com/element-hq/element-web/pull/33598)). Contributed by @MidhunSureshR.
+* Add support for `m.recent_emoji` account data event ([#33172](https://github.com/element-hq/element-web/pull/33172)). Contributed by @t3chguy.
+* Room list: reduce font size of sections ([#33580](https://github.com/element-hq/element-web/pull/33580)). Contributed by @florianduros.
+
+## 🐛 Bug Fixes
+
+* Remove resizer from fullscreen modules(like multiroom) ([#33684](https://github.com/element-hq/element-web/pull/33684)). Contributed by @langleyd.
+* fix: use configured brand name in JSON and PlainText chat export filenames ([#33680](https://github.com/element-hq/element-web/pull/33680)). Contributed by @RoySerbi.
+* Fix pinned message banner disappearing when a pinned message event is unkown ([#33534](https://github.com/element-hq/element-web/pull/33534)). Contributed by @florianduros.
+
+
 Changes in [1.12.20](https://github.com/element-hq/element-web/releases/tag/v1.12.20) (2026-05-27)
 ==================================================================================================
 ## 🐛 Bug Fixes
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index c4fde34dab..325ac42ba5 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -3,7 +3,7 @@
     "productName": "Element",
     "main": "lib/electron-main.js",
     "exports": "./lib/electron-main.js",
-    "version": "1.12.20",
+    "version": "1.12.21",
     "description": "Element: the future of secure communication",
     "author": {
         "name": "Element",
diff --git a/apps/web/package.json b/apps/web/package.json
index 97562beab5..f64d74e95e 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.12.20",
+    "version": "1.12.21",
     "description": "Element: the future of secure communication",
     "author": "New Vector Ltd.",
     "repository": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e7b80b5559..f0cba11811 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -648,7 +648,7 @@ importers:
         version: 1.0.3
       matrix-js-sdk:
         specifier: github:matrix-org/matrix-js-sdk#develop
-        version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/69ebf0e4aaf0e314033fa9276771facbc84f08b3
+        version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/33e4db98814edb1e100ac8b9721cf84de998f429
       matrix-widget-api:
         specifier: ^1.17.0
         version: 1.17.0
@@ -10485,9 +10485,9 @@ packages:
   matrix-events-sdk@0.0.1:
     resolution: {integrity: sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==}
 
-  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/69ebf0e4aaf0e314033fa9276771facbc84f08b3:
-    resolution: {gitHosted: true, integrity: sha512-/3+DyORYCwZR5B0coWRU6mPQpGvFZj4cMNZVU2Zvw6PgRzzGFjKnRUN5DPDckrugeFfgDPytJO907rVx8wXqpw==, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/69ebf0e4aaf0e314033fa9276771facbc84f08b3}
-    version: 41.6.0
+  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/33e4db98814edb1e100ac8b9721cf84de998f429:
+    resolution: {gitHosted: true, integrity: sha512-6Ywd3lm0ea7lbZ43fCxXpdWKi8hdKm0W+Cs3oQcso0VLOHKJuhk1HW818xQ3QZMEY1f7eZJhNqRY+PmvxLpswA==, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/33e4db98814edb1e100ac8b9721cf84de998f429}
+    version: 41.7.0
     engines: {node: '>=22.0.0'}
 
   matrix-web-i18n@3.6.0:
@@ -24141,7 +24141,7 @@ snapshots:
 
   matrix-events-sdk@0.0.1: {}
 
-  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/69ebf0e4aaf0e314033fa9276771facbc84f08b3:
+  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/33e4db98814edb1e100ac8b9721cf84de998f429:
     dependencies:
       '@babel/runtime': 7.29.7
       '@matrix-org/matrix-sdk-crypto-wasm': 18.3.1