diff --git a/CHANGELOG b/CHANGELOG
index 2357ae2..c321b66 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2140,3 +2140,11 @@ Improve replication performance. See (#12080, #12054, #12009) for more details.
 * Capture percentage of cpu load and memory used by @anjalshireesh in #18596
 * fix: use the right channel to feed the data in by @harshavardhana in #18605
 * Update Console version to v0.42.1 by @bexsoft in #18606
+
+[3.11.0]
+* Update minio to 2023-12-09T18-17-51Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2023-12-09T18-17-51Z)
+* Add support of conf file to pass arguments and options by @vadmeste in #18592
+* feat: add events_errors_total metric by @jiuker in #18610
+* add configuration to limit replication workers by @poornas in #18601
+* use latest minisign release by @harshavardhana in #18614
diff --git a/CloudronManifest.json b/CloudronManifest.json
index cebdc0e..265c375 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "3.10.2",
-  "upstreamVersion": "2023-12-07T04-16-00Z",
+  "version": "3.11.0",
+  "upstreamVersion": "2023-12-09T18-17-51Z",
   "healthCheckPath": "/minio/login",
   "memoryLimit": 805306368,
   "httpPort": 8000,
diff --git a/start.sh b/start.sh
index 62c5b33..b5ffd43 100755
--- a/start.sh
+++ b/start.sh
@@ -4,6 +4,7 @@ set -eu
 
 mkdir -p /app/data/data /run/minio/config /run/minio/certs
 
+# env vars take precedence over config.yaml (https://github.com/minio/minio/blob/master/docs/distributed/CONFIG.md#things-to-know)
 [[ ! -f /app/data/env.sh ]] && cp /app/code/env.sh /app/data/env.sh
 source /app/data/env.sh