diff --git a/bitnami/thanos/0/scratch/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/thanos/0/scratch/prebuildfs/opt/bitnami/.bitnami_components.json
index 2c414041216e..76ab767c2fdb 100644
--- a/bitnami/thanos/0/scratch/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/thanos/0/scratch/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,7 +1,7 @@
 {
     "thanos": {
-        "digest": "f55d06fb037884c8034dc6afe9d9151ae6dc323dce4a5cab1a42a661a88458a4",
+        "digest": "04c915dfd2edf2dfc260a2c309e4066d1aef7d8bf044a6ffadd1ebc3593e5266",
         "type": "BLACKSMITH",
-        "version": "0.17.2"
+        "version": "0.18.0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/thanos/README.md b/bitnami/thanos/README.md
index 6344d9f521a4..95cb31667012 100644
--- a/bitnami/thanos/README.md
+++ b/bitnami/thanos/README.md
@@ -38,7 +38,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`0`, `0-scratch`, `0.17.2`, `0.17.2-scratch-r2`, `latest` (0/scratch/Dockerfile)](https://github.com/bitnami/bitnami-docker-thanos/blob/0.17.2-scratch-r2/0/scratch/Dockerfile)
+* [`0`, `0-scratch`, `0.18.0`, `0.18.0-scratch-r0`, `latest` (0/scratch/Dockerfile)](https://github.com/bitnami/bitnami-docker-thanos/blob/0.18.0-scratch-r0/0/scratch/Dockerfile)
 
 # Connecting to other containers
 
diff --git a/bitnami/thanos/docker-compose-cluster.yml b/bitnami/thanos/docker-compose-cluster.yml
index 495f008f2ff7..dfc011f14a4a 100644
--- a/bitnami/thanos/docker-compose-cluster.yml
+++ b/bitnami/thanos/docker-compose-cluster.yml
@@ -52,7 +52,7 @@ services:
       - prometheus
   # MinIO
   minio:
-    image: docker.io/bitnami/minio:2020
+    image: docker.io/bitnami/minio:2021
     ports:
       - '9000:9000'
     volumes: