diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb6d7dceaa..f823bdd3a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,43 @@
 -->
 # Changelog
 
+## 8.6.0-beta.1
+
+### Added
+
+- Emit notification on mentions @juliusknorr [#3960](https://github.com/nextcloud/richdocuments/pull/3960)
+- Move template settings to vue component @elzody [#4125](https://github.com/nextcloud/richdocuments/pull/4125)
+- Digitally sign documents via software certificates @vmiklos [4129](https://github.com/nextcloud/richdocuments/pull/4129)
+- `startPresentation` URL parameter @elzody [#4209](https://github.com/nextcloud/richdocuments/pull/4209)
+- Electronic signing, add settings for eIDEasy @vmiklos [#4328](https://github.com/nextcloud/richdocuments/pull/4328)
+- Insert text and images generated with nextcloud assistant @elzody [#4333](https://github.com/nextcloud/richdocuments/pull/4333)
+- Add Template and pages/numbers/keynote mimetypes @juliusknorr [#4350](https://github.com/nextcloud/richdocuments/pull/4350)
+- Add another option for otf font mimetypes @juliusknorr [#4368](https://github.com/nextcloud/richdocuments/pull/4368)
+
+
+### Fixed
+
+- Catch InvalidFieldTypeException @juliusknorr [#3956](https://github.com/nextcloud/richdocuments/pull/3956)
+- Check for mimetype before processing new file from template @juliusknorr [#3958](https://github.com/nextcloud/richdocuments/pull/3958)
+- Catch parsing errors or null doc structure @juliusknorr [#3967](https://github.com/nextcloud/richdocuments/pull/3967)
+- Dispatch event instead of hook for audit logging @juliusknorr [#3969](https://github.com/nextcloud/richdocuments/pull/3969)
+- Pressing `Enter` submits guest name input @elzody [#3992](https://github.com/nextcloud/richdocuments/pull/3992)
+- Failed token generation on public shares @elzody [#4030](https://github.com/nextcloud/richdocuments/pull/4030)
+- Use proper file id for direct editing @juliusknorr [#4101](https://github.com/nextcloud/richdocuments/pull/4101)
+- Use correct save path when renaming @elzody [#4378](https://github.com/nextcloud/richdocuments/pull/4378)
+- Proper messages to mention response @juliusknorr [#4102](https://github.com/nextcloud/richdocuments/pull/4102)
+- Use autocomplete api for mentions @elzody [#4210](https://github.com/nextcloud/richdocuments/pull/4210)
+- Use new db types constants @elzody [#4230](https://github.com/nextcloud/richdocuments/pull/4230)
+- Update federated-editing.md @maximelehericy [#4251](https://github.com/nextcloud/richdocuments/pull/4251)
+- Apply viewer wrapper as we do it in text @juliusknorr [#4278](https://github.com/nextcloud/richdocuments/pull/4278)
+- Properly get empty template for direct editing @juliusknorr [#4335](https://github.com/nextcloud/richdocuments/pull/4335)
+- Notifier::prepare() threw \InvalidArgumentException @nickvergessen [#4353](https://github.com/nextcloud/richdocuments/pull/4353)
+- Skip errors that may interrupt file creation @juliusknorr [#4360](https://github.com/nextcloud/richdocuments/pull/4360)
+- Apply proper default timezone for watermarks @juliusknorr [#4366](https://github.com/nextcloud/richdocuments/pull/4366)
+
+### Other
+- Rector @juliusknorr [#4045](https://github.com/nextcloud/richdocuments/pull/4045)
+
 ## 8.5.0-beta.1
 
 ### Added
diff --git a/appinfo/info.xml b/appinfo/info.xml
index a0bb99f495..76deb1108b 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -11,7 +11,7 @@
 	<description><![CDATA[This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.
 
 You can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.]]></description>
-	<version>9.0.0-dev.0</version>
+	<version>8.6.0-beta.1</version>
 	<licence>agpl</licence>
 	<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
 	<types>
diff --git a/package-lock.json b/package-lock.json
index b30e76bf18..94fdc3b25d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "richdocuments",
-  "version": "9.0.0-dev.0",
+  "version": "8.6.0-beta.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 33392ec892..9c0ef03221 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "richdocuments",
   "description": "Collabora online integration",
-  "version": "9.0.0-dev.0",
+  "version": "8.6.0-beta.1",
   "authors": [
     {
       "name": "Julius Härtl",