diff --git a/CHANGELOG b/CHANGELOG
index 41d8427..4146961 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -513,3 +513,9 @@
 * [Full changelog](https://github.com/matrix-org/synapse/releases/tag/v1.46.0)
 * Fix a bug introduced in v1.46.0rc1 where URL previews of some XML documents would fail. (#11196)
 
+[1.36.0]
+* Update Synapse to 1.47.0
+* [Full changelog](https://github.com/matrix-org/synapse/releases/tag/v1.47.0)
+* Fix a bug introduced in 1.47.0rc1 which caused worker processes to not halt startup in the presence of outstanding database migrations. (#11346)
+* Fix a bug introduced in 1.47.0rc1 which prevented the 'remove deleted devices from device_inbox column' background process from running when updating from a recent Synapse version. (#11303, #11353)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 5cb4f42..e48478d 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Secure & decentralized communication",
-  "version": "1.35.0",
+  "version": "1.36.0",
   "healthCheckPath": "/",
   "httpPort": 8008,
   "memoryLimit": 536870912,
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index c77ce48..f741e04 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Synapse <upstream>1.46.0</upstream>.
+This app packages Synapse <upstream>1.47.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
diff --git a/Dockerfile b/Dockerfile
index 2bd4d84..66c0847 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN virtualenv -p python3 /app/code/env
 ENV VIRTUAL_ENV=/app/code/env
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
-ARG VERSION=v1.46.0
+ARG VERSION=v1.47.0
 
 # Synapse (https://github.com/matrix-org/synapse/blob/master/INSTALL.md)
 # lxml - required for previews