diff --git a/CHANGELOG b/CHANGELOG
index 2efd208..827f98a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1862,3 +1862,14 @@ Improve replication performance. See (#12080, #12054, #12009) for more details.
 * skip onlineDisks with parity mismatch by @harshavardhana in #17478
 * Add an option to make bucket notifications synchronous by @Praveenrajmani in #17406
 * always look for expired versions v/s remaining versions by @harshavardhana in #17479
+
+[3.6.0]
+* Update minio to 2023-06-29T05-12-28Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2023-06-29T05-12-28Z)
+* fix: do not listAndHeal() inline with PutObject() by @harshavardhana in #17499
+* Print certain log messages once per error by @kaankabalak in #17484
+* chore: pkg imported more than once by @testwill in #17444
+* update all our deps by @harshavardhana in #17497
+* 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
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 5a8044b..321d194 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "3.5.6",
-  "upstreamVersion": "2023-06-23T20-26-00Z",
+  "version": "3.6.0",
+  "upstreamVersion": "2023-06-29T05-12-28Z",
   "healthCheckPath": "/minio/login",
   "memoryLimit": 805306368,
   "httpPort": 8000,