diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d9cdfb..1c88c64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1840,3 +1840,14 @@
 * Start automerge check again after the conflict check and the schedule ([#​34988](https://github.com/go-gitea/gitea/issues/34988)) ([#​35002](https://github.com/go-gitea/gitea/issues/35002))
 * Fix the response format for actions/workflows ([#​35009](https://github.com/go-gitea/gitea/issues/35009)) ([#​35016](https://github.com/go-gitea/gitea/issues/35016))
 
+[1.36.5]
+* Update gitea to 1.24.4
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.24.4)
+* Fix various bugs (1.24) ([#​35186](https://github.com/go-gitea/gitea/issues/35186))
+* Fix migrate input box bug ([#​35166](https://github.com/go-gitea/gitea/issues/35166)) ([#​35171](https://github.com/go-gitea/gitea/issues/35171))
+* Only hide dropzone when no files have been uploaded ([#​35156](https://github.com/go-gitea/gitea/issues/35156)) ([#​35167](https://github.com/go-gitea/gitea/issues/35167))
+* Fix review comment/dimiss comment x reference can be refereced back ([#​35094](https://github.com/go-gitea/gitea/issues/35094)) ([#​35099](https://github.com/go-gitea/gitea/issues/35099))
+* Fix submodule nil check ([#​35096](https://github.com/go-gitea/gitea/issues/35096)) ([#​35098](https://github.com/go-gitea/gitea/issues/35098))
+* Don't use full-file highlight when there is a git diff textconv ([#​35114](https://github.com/go-gitea/gitea/issues/35114)) ([#​35119](https://github.com/go-gitea/gitea/issues/35119))
+* Increase gap on latest commit ([#​35104](https://github.com/go-gitea/gitea/issues/35104)) ([#​35113](https://github.com/go-gitea/gitea/issues/35113))
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 2764a97..ed33888 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.36.4",
+  "version": "1.36.5",
   "upstreamVersion": "1.24.4",
   "healthCheckPath": "/explore",
   "httpPort": 3000,