diff --git a/packages/server/package-lock.json b/packages/server/package-lock.json
index a2533b0c9..460d9ff1a 100644
--- a/packages/server/package-lock.json
+++ b/packages/server/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/server",
-  "version": "2.2.11",
+  "version": "2.3.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 24a1ebda1..606ddedcd 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/server",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "private": true,
   "scripts": {
     "start-dev": "nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev",
diff --git a/readme/changelog_server.md b/readme/changelog_server.md
index 050dfbfb7..4cca815b9 100644
--- a/readme/changelog_server.md
+++ b/readme/changelog_server.md
@@ -1,5 +1,15 @@
 # Joplin Server Changelog
 
+## [server-v2.3.1-beta](https://github.com/laurent22/joplin/releases/tag/server-v2.3.1-beta) (Pre-release) - 2021-08-12T15:49:58Z
+
+- Improved: Allow setting email key to prevent the same email to be sent multiple times (391204c)
+- Improved: Clarify beta transition message (c4fcfec)
+- Improved: Disable upload for accounts with subscription failed payments (f14c74d)
+- Improved: Re-enable account when subscription is paid (4b5318c)
+- Improved: Set better filename and mime type for files downloaded via published notes (#5286)
+- Fixed: Fix regression (6359c9c)
+- Fixed: Fixed layout of notes on mobile devices (#5269)
+
 ## [server-v2.2.11-beta](https://github.com/laurent22/joplin/releases/tag/server-v2.2.11-beta) (Pre-release) - 2021-08-03T18:48:00Z
 
 - Improved: Disable beta account once expired (785248b)