diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd7f8d439f30..af662a638445 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 #### Loki
 
 ##### Enhancements
+* [6691](https://github.com/grafana/loki/pull/6691) **dannykopping**: Update production-ready Loki cluster in docker-compose
 * [6317](https://github.com/grafana/loki/pull/6317) **dannykoping**: General: add cache usage statistics
 * [6444](https://github.com/grafana/loki/pull/6444) **aminesnow** Add TLS config to query frontend.
 * [6372](https://github.com/grafana/loki/pull/6372) **splitice**: Add support for numbers in JSON fields.
diff --git a/docs/sources/upgrading/_index.md b/docs/sources/upgrading/_index.md
index 46e2634f6b16..e551adfda7a7 100644
--- a/docs/sources/upgrading/_index.md
+++ b/docs/sources/upgrading/_index.md
@@ -42,6 +42,16 @@ If you want to run at most a single querier per node, set `$._config.querier.use
 
 This value now defaults to 3100, so the Loki process doesn't require special privileges. Previously, it had been set to port 80, which is a privileged port. If you need Loki to listen on port 80, you can set it back to the previous default using `-server.http-listen-port=80`.
 
+#### docker-compose setup has been updated
+
+The docker-compose [setup](https://github.com/grafana/loki/blob/main/production/docker) has been updated to **v2.6.0** and includes many improvements.
+
+Notable changes include:
+- authentication (multi-tenancy) is **enabled** by default; you can disable it in `production/docker/config/loki.yaml` by setting `auth_enabled: false`
+- storage is now using Minio instead of local filesystem
+  - move your current storage into `.data/minio` and it should work transparently
+- log-generator was added - if you don't need it, simply remove the service from `docker-compose.yaml` or don't start the service
+
 ## 2.6.0
 
 ### Loki
diff --git a/production/docker/config/nginx.conf b/production/docker/config/nginx.conf
index bd19a04fb906..45676d11c2e2 100644
--- a/production/docker/config/nginx.conf
+++ b/production/docker/config/nginx.conf
@@ -34,7 +34,8 @@ http {
 
   server {
     listen 80;
-    
+    listen 3100;
+
     location = /ring {
         proxy_pass       http://cluster$request_uri;
     }
diff --git a/production/docker/docker-compose.yaml b/production/docker/docker-compose.yaml
index 2ddf715ea8b9..944fe6a6e46a 100644
--- a/production/docker/docker-compose.yaml
+++ b/production/docker/docker-compose.yaml
@@ -79,6 +79,7 @@ services:
       - ./config/nginx.conf:/etc/nginx/nginx.conf
     ports:
       - "8080:80"
+      - "3100"
     networks:
       - loki