diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4396b3..2130253 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1316,3 +1316,29 @@
 * [docs] Add missing backtick in quickstart.zh-cn.md (#26349) (#26357)
 * Upgrade x/net to 0.13.0 (#26301)
 
+[1.29.4]
+* Update Gitea to 1.20.4
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.20.4)
+* Check blocklist for emails when adding them to account (#26812) (#26831)
+* Add branch_filter to hooks API endpoints (#26599) (#26632)
+* Fix incorrect "tabindex" attributes (#26733) (#26734)
+* Use line-height: normal by default (#26635) (#26708)
+* Fix unable to display individual-level project (#26198) (#26636)
+* Fix wrong review requested number (#26784) (#26880)
+* Avoid double-unescaping of form value (#26853) (#26863)
+* Redirect from {repo}/issues/new to {repo}/issues/new/choose when blank issues are disabled (#26813) (#26847)
+* Sync tags when adopting repos (#26816) (#26834)
+* Fix verifyCommits error when push a new branch (#26664) (#26810)
+* Include the GITHUB_TOKEN/GITEA_TOKEN secret for fork pull requests (#26759) (#26806)
+* Fix some slice append usages (#26778) (#26798)
+* Add fix incorrect can_create_org_repo for org owner team (#26683) (#26791)
+* Fix bug for ctx usage (#26763)
+* Make issue template field template access correct template data (#26698) (#26709)
+* Use correct minio error (#26634) (#26639)
+* Ignore the trailing slashes when comparing oauth2 redirect_uri (#26597) (#26618)
+* Set errwriter for urfave/cli v1 (#26616)
+* Fix reopen logic for agit flow pull request (#26399) (#26613)
+* Fix context filter has no effect in dashboard (#26695) (#26811)
+* Fix being unable to use a repo that prohibits accepting PRs as a PR source. (#26785) (#26790)
+* Fix Page Not Found error (#26768)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 5ab9637..f5b4cff 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -4,8 +4,8 @@
   "author": "Gitea developers",
   "description": "file://DESCRIPTION.md",
   "tagline": "A painless self-hosted Git Service",
-  "version": "1.29.3",
-  "upstreamVersion": "1.20.3",
+  "version": "1.29.4",
+  "upstreamVersion": "1.20.4",
   "healthCheckPath": "/explore",
   "httpPort": 3000,
   "memoryLimit": 536870912,
diff --git a/Dockerfile b/Dockerfile
index 03e9ee9..26c4213 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ WORKDIR /home/git
 # for autosign feature
 ENV GNUPGHOME="/app/data/gnupg"
 
-ARG VERSION=1.20.3
+ARG VERSION=1.20.4
 
 RUN curl -L https://dl.gitea.io/gitea/${VERSION}/gitea-${VERSION}-linux-amd64 -o /home/git/gitea/gitea \
     && chmod +x /home/git/gitea/gitea