diff --git a/CHANGELOG b/CHANGELOG
index db7a6fe..e475af9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -172,3 +172,15 @@
 * Fixes a long standing bug in worker mode where worker information was saved in the devices table instead of the original IP address and user agent. (#7797)
 * Fix 'stuck invites' which happen when we are unable to reject a room invite received over federation. (#7804, #7809, #7810)
 
+[1.8.0]
+* Update Synapse to 1.18.0
+* [Full changelog](https://github.com/matrix-org/synapse/releases/tag/v1.18.0)
+* Include room states on invite events that are sent to application services. Contributed by @Sorunome. (#6455)
+* Add delete room admin endpoint (POST /_synapse/admin/v1/rooms/<room_id>/delete). Contributed by @dklimpel. (#7613, #7953)
+* Add experimental support for running multiple federation sender processes. (#7798)
+* Add the option to validate the iss and aud claims for JWT logins. (#7827)
+* Add support for handling registration requests across multiple client reader workers. (#7830)
+* Add an admin API to list the users in a room. Contributed by Awesome Technologies Innovationslabor GmbH. (#7842)
+* Allow email subjects to be customised through Synapse's configuration. (#7846)
+* Add the ability to re-activate an account from the admin API. (#7847, #7908)
+* Support oEmbed for media previews. (#7920)
diff --git a/CloudronManifest.json b/CloudronManifest.json
index a933b9e..5af2536 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Secure & decentralized communication",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "healthCheckPath": "/",
   "httpPort": 8008,
   "memoryLimit": 536870912,
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index e6a3ff9..1e6f5d6 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Synapse <upstream>1.17.0</upstream>.
+This app packages Synapse <upstream>1.18.0</upstream>.
 
 **This package only provides the Matrix backend. A variety of clients are available
 [here](https://matrix.org/clients/). Riot is a popular web frontend for Matrix and