diff --git a/CHANGELOG b/CHANGELOG
index d0ac14b..a39d9e9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -969,3 +969,39 @@
 * Improve reviewing PR UX (#19612)
 * Add support for rendering console output with colors (#19497)
 
+[1.24.1]
+* Update Gitea to 1.17.1
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.17.1)
+* Correctly escape within tribute.js (#20831) (#20832)
+* Add support for NuGet API keys (#20721) (#20734)
+* Display project in issue list (#20583)
+* Add disable download source configuration (#20548) (#20579)
+* Add username check to doctor (#20140) (#20671)
+* Enable Wire 2 for Internal SSH Server (#20616) (#20617)
+* Use the total issue count for UI (#20785) (#20827)
+* Add proxy host into allow list (#20798) (#20819)
+* Add missing translation for queue flush workers (#20791) (#20792)
+* Improve comment header for mobile (#20781) (#20789)
+* Fix git.Init for doctor sub-command (#20782) (#20783)
+* Check webhooks slice length before calling xorm (#20642) (#20768)
+* Remove manual rollback for failed generated repositories (#20639) (#20762)
+* Use correct field name in npm template (#20675) (#20760)
+* Keep download count on Container tag overwrite (#20728) (#20735)
+* Fix v220 migration to be compatible for MSSQL 2008 r2 (#20702) (#20707)
+* Use request timeout for git service rpc (#20689) (#20693)
+* Send correct NuGet status codes (#20647) (#20677)
+* Use correct context to get package content (#20673) (#20676)
+* Fix the JS error "EventSource is not defined" caused by some non-standard browsers (#20584) (#20663)
+* Add default commit messages to PR for squash merge (#20618) (#20645)
+* Fix package upload for files >32mb (#20622) (#20635)
+* Fix the new-line copy-paste for rendered code (#20612)
+* Clean up and fix clone button script (#20415 & #20600) (#20599)
+* Fix default merge style (#20564) (#20565)
+* Add repository condition for issue count (#20454) (#20496)
+* Make branch icon stand out more (#20726) (#20774)
+* Fix loading button with invalid form (#20754) (#20759)
+* Fix SecToTime edge-cases (#20610) (#20611)
+* Executable check always returns true for windows (#20637) (#20835)
+* Check issue labels slice length before calling xorm Insert (#20655) (#20836)
+* Fix owners cannot create organization repos bug (#20841) (#20854)
+* Prevent 500 is head repo does not have PullRequest unit in IsUserAllowedToUpdate (#20839) (#20848)
diff --git a/CloudronManifest.json b/CloudronManifest.json
index d3fcc07..d682261 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.24.0",
-  "upstreamVersion": "1.17.0",
+  "version": "1.24.1",
+  "upstreamVersion": "1.17.1",
   "healthCheckPath": "/explore",
   "httpPort": 3000,
   "memoryLimit": 536870912,
diff --git a/Dockerfile b/Dockerfile
index bcc302d..cc2e5d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN passwd -d git
 RUN mkdir -p /home/git/gitea
 WORKDIR /home/git
 
-ARG VERSION=1.17.0
+ARG VERSION=1.17.1
 
 RUN curl -L https://dl.gitea.io/gitea/${VERSION}/gitea-${VERSION}-linux-amd64 -o /home/git/gitea/gitea \
     && chmod +x /home/git/gitea/gitea