diff --git a/CHANGELOG b/CHANGELOG
index 70c0fea..f6e0037 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -900,3 +900,11 @@
 * Stop logging an error when notes are not found (#18626) (#18635)
 * Ensure that blob-excerpt links work for wiki (#18587) (#18624)
 * Only attempt to flush queue if the underlying worker pool is not finished (#18593) (#18620)
+
+[1.23.6]
+* Update Gitea to 1.16.2
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.16.2)
+* Show fullname on issue edits and gpg/ssh signing info (#18828)
+* Immediately Hammer if second kill is sent (#18823) (#18826)
+* Allow mermaid render error to wrap (#18791)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index a3611fd..9cdfac7 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.23.5",
+  "version": "1.23.6",
   "healthCheckPath": "/explore",
   "httpPort": 3000,
   "memoryLimit": 536870912,
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index 1227ef1..dd406e0 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Gitea <upstream>1.16.1</upstream>
+This app packages Gitea <upstream>1.16.2</upstream>
 
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.