diff --git a/CHANGELOG b/CHANGELOG
index 125505b..b10742d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -834,3 +834,13 @@
 * AutoRegistration is supposed to be working with disabled registration (backport) (#17292)
 * Handle duplicate keys on GPG key ring (#17242) (#17284)
 * Fix SVG side by side comparison link (#17375) (#17391)
+
+[1.22.6]
+* Update Gitea to 1.15.6
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.15.6)
+* Prevent panic in serv.go with Deploy Keys (#17434) (#17435)
+* Fix CSV render error (#17406) (#17431)
+* Read expected buffer size (#17409) (#17430)
+* Ensure that restricted users can access repos for which they are members (#17460) (#17464)
+* Make commit-statuses popup show correctly (#17447) (#17466)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 42f77c5..9d4ca26 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.22.5",
+  "version": "1.22.6",
   "healthCheckPath": "/explore",
   "httpPort": 3000,
   "memoryLimit": 536870912,
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index 073e8b3..a7cd20f 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Gitea <upstream>1.15.5</upstream>
+This app packages Gitea <upstream>1.15.6</upstream>
 
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.
 
diff --git a/Dockerfile b/Dockerfile
index 9ffe92c..35b5143 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.15.5
+ARG VERSION=1.15.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