diff --git a/CHANGELOG b/CHANGELOG
index 827f98a..c45115c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1873,3 +1873,15 @@ Improve replication performance. See (#12080, #12054, #12009) for more details.
 * Capture realtime metrics in health report by @anjalshireesh in #17516
 * allow site-replication checks to work on non-distributed setups by @harshavardhana in #17524
 * fix: bug in passing Versioned field set for getHealReplicationInfo() by @harshavardhana in #17498
+
+[3.6.1]
+* Update minio to 2023-07-07T07-13-57Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2023-07-07T07-13-57Z)
+* fix: OpenID config initialization by @donatello in #17544
+* fix: service account list for root user by @donatello in #17547
+* fix: for FTP server driver allow implicit trust TLS by @harshavardhana in #17541
+* s3: Fix a typo in per pool make/delete bucket errs calculation by @vadmeste in #17553
+* fix: honor older scanner settings only if newer has not changed by @harshavardhana in #17564
+* fix: upon DNS refresh() failure use previous values by @harshavardhana in #17561
+* fix: create user without policy that is required by @jiuker in #17554
+* fix: under FanOut API avoid repeated md5sum calculation by @harshavardhana in #17572
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 321d194..20ec340 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "3.6.0",
-  "upstreamVersion": "2023-06-29T05-12-28Z",
+  "version": "3.6.1",
+  "upstreamVersion": "2023-07-07T07-13-57Z",
   "healthCheckPath": "/minio/login",
   "memoryLimit": 805306368,
   "httpPort": 8000,