diff --git a/CHANGELOG b/CHANGELOG
index e9e9555..92037d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -684,3 +684,10 @@
* Don't mark each comment poster as OP (#14971) (#14972)
* Add "captcha" to list of reserved usernames (#14930)
* Re-enable import local paths after reversion from #13610 (#14925) (#14927)
+
+[1.20.4]
+* Update Gitea to 1.13.6
+* Fix bug on avatar middleware (#15124) (#15125)
+* Fix another clusterfuzz identified issue (#15096) (#15114)
+* Fix nil exeption for get pull reviews API #15104 (#15106)
+* Fix markdown rendering in milestone content (#15056) (#15092)
diff --git a/CloudronManifest.json b/CloudronManifest.json
index e8b04f1..c20a334 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -4,7 +4,7 @@
"author": "Gitea developers",
"description": "file://DESCRIPTION.md",
"tagline": "A painless self-hosted Git Service",
- "version": "1.20.3",
+ "version": "1.20.4",
"healthCheckPath": "/healthcheck",
"httpPort": 3000,
"memoryLimit": 536870912,
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index 1dca176..1f521bc 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Gitea 1.13.5
+This app packages Gitea 1.13.6
Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.
diff --git a/Dockerfile b/Dockerfile
index ffbdb63..24779d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ RUN passwd -d git
RUN mkdir -p /home/git/gitea
WORKDIR /home/git
-ARG VERSION=1.13.5
+ARG VERSION=1.13.6
RUN curl -L https://dl.gitea.io/gitea/${VERSION}/gitea-${VERSION}-linux-amd64 -o /home/git/gitea/gitea \
&& chmod +x /home/git/gitea/gitea