diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93552bd87..a8378380c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,18 @@ the full log, please refer to the git commit history.
 > See https://github.com/threema-ch/threema-web/pull/996 for more details.
 
 
+### [v2.4.0][v2.4.0] (2022-04-28)
+
+Changes:
+
+* [feature] Allow quoting all message types, if the app supports it
+  ([#1125][i1125])
+* [feature] Add dedicated userconfig override file, ignore env vars if present
+  ([#1121][i1121], [#1128][i1128])
+* [change] Add scan instructions on welcome page ([#1126][i1126])
+* [change] Upgrade many dependencies ([#1129][i1129])
+
+
 ### [v2.3.20][v2.3.20] (2022-03-31)
 
 Changes:
@@ -17,6 +29,7 @@ Changes:
 * [bug] Workaround for Firefox non-standard PDF download behavior ([#1120][i1120])
 * [change] Upgrade many dependencies ([#1110][i1110], [#1119][i1119])
 
+
 ### [v2.3.19][v2.3.19] (2022-01-10)
 
 Changes:
@@ -1157,7 +1170,13 @@ First public release.
 [i1110]: https://github.com/threema-ch/threema-web/pull/1110
 [i1119]: https://github.com/threema-ch/threema-web/pull/1119
 [i1120]: https://github.com/threema-ch/threema-web/pull/1120
+[i1121]: https://github.com/threema-ch/threema-web/pull/1121
+[i1125]: https://github.com/threema-ch/threema-web/pull/1125
+[i1126]: https://github.com/threema-ch/threema-web/pull/1126
+[i1128]: https://github.com/threema-ch/threema-web/pull/1128
+[i1129]: https://github.com/threema-ch/threema-web/pull/1129
 
+[v2.4.0]: https://github.com/threema-ch/threema-web/compare/v2.3.20...v2.4.0
 [v2.3.20]: https://github.com/threema-ch/threema-web/compare/v2.3.19...v2.3.20
 [v2.3.19]: https://github.com/threema-ch/threema-web/compare/v2.3.18...v2.3.19
 [v2.3.18]: https://github.com/threema-ch/threema-web/compare/v2.3.17...v2.3.18
diff --git a/docker/rebuild.sh b/docker/rebuild.sh
index c9b793083..6880f163f 100644
--- a/docker/rebuild.sh
+++ b/docker/rebuild.sh
@@ -13,7 +13,7 @@
 set -euo pipefail
 
 SUPPORTED_BRANCH_NAMES=("master")
-SUPPORTED_TAG_PATTERNS=("^v2.3.1[789]$" "^v2.3.2[0-9]$")
+SUPPORTED_TAG_PATTERNS=("^v2.3.1[89]$" "^v2.3.2[0-9]$" "^v2.4.[0-9]$")
 IMAGE_NAME=threema/threema-web
 
 if [ "${1:-}" = "--dry-run" ]; then
diff --git a/package-lock.json b/package-lock.json
index f5050bfeb..9e5e4bb4a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "threema-web",
-  "version": "2.3.20",
+  "version": "2.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7dfa1cf29..04c116e2f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "threema-web",
-  "version": "2.3.20",
+  "version": "2.4.0",
   "description": "Threema Webclient",
   "scripts": {
     "build": "npm run build:js && npm run build:css",