diff --git a/modules/aws/kube-prometheus.tf b/modules/aws/kube-prometheus.tf
index c5e0185b0..690df52d1 100644
--- a/modules/aws/kube-prometheus.tf
+++ b/modules/aws/kube-prometheus.tf
@@ -19,7 +19,7 @@ locals {
       thanos_bucket                     = "thanos-store-${var.cluster-name}"
       thanos_bucket_force_destroy       = false
       thanos_store_config               = null
-      thanos_version                    = "v0.36.1"
+      thanos_version                    = "v0.37.2"
       enabled                           = false
       allowed_cidrs                     = ["0.0.0.0/0"]
       default_network_policy            = true
diff --git a/modules/aws/thanos-memcached.tf b/modules/aws/thanos-memcached.tf
index 362d30482..fbb7c8653 100644
--- a/modules/aws/thanos-memcached.tf
+++ b/modules/aws/thanos-memcached.tf
@@ -3,9 +3,9 @@ locals {
   thanos-memcached = merge(
     local.helm_defaults,
     {
-      chart         = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].name
-      repository    = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].repository
-      chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].version
+      chart         = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].name
+      repository    = ""
+      chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].version
       name          = "thanos-memcached"
       namespace     = local.thanos["namespace"]
       enabled       = false
diff --git a/modules/aws/thanos.tf b/modules/aws/thanos.tf
index ef08a9df2..c672dac2a 100644
--- a/modules/aws/thanos.tf
+++ b/modules/aws/thanos.tf
@@ -3,10 +3,10 @@ locals {
   thanos = merge(
     local.helm_defaults,
     {
-      name                      = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
-      chart                     = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
-      repository                = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].repository
-      chart_version             = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].version
+      name                      = "thanos"
+      chart                     = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].name
+      repository                = ""
+      chart_version             = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].version
       namespace                 = "monitoring"
       create_iam_resources_irsa = true
       iam_policy_override       = null
diff --git a/modules/google/kube-prometheus.tf b/modules/google/kube-prometheus.tf
index bd73b8a01..e104563de 100644
--- a/modules/google/kube-prometheus.tf
+++ b/modules/google/kube-prometheus.tf
@@ -21,7 +21,7 @@ locals {
       thanos_bucket                         = "thanos-store-${var.cluster-name}"
       thanos_bucket_force_destroy           = false
       thanos_store_config                   = null
-      thanos_version                        = "v0.36.1"
+      thanos_version                        = "v0.37.2"
       thanos_service_account                = ""
       enabled                               = false
       allowed_cidrs                         = ["0.0.0.0/0"]
diff --git a/modules/google/thanos-memcached.tf b/modules/google/thanos-memcached.tf
index 362d30482..fbb7c8653 100644
--- a/modules/google/thanos-memcached.tf
+++ b/modules/google/thanos-memcached.tf
@@ -3,9 +3,9 @@ locals {
   thanos-memcached = merge(
     local.helm_defaults,
     {
-      chart         = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].name
-      repository    = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].repository
-      chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].version
+      chart         = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].name
+      repository    = ""
+      chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].version
       name          = "thanos-memcached"
       namespace     = local.thanos["namespace"]
       enabled       = false
diff --git a/modules/google/thanos-receive.tf b/modules/google/thanos-receive.tf
index f433adcb9..1cc9c155f 100644
--- a/modules/google/thanos-receive.tf
+++ b/modules/google/thanos-receive.tf
@@ -3,10 +3,10 @@ locals {
   thanos-receive = merge(
     local.helm_defaults,
     {
-      name                    = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
-      chart                   = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
-      repository              = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].repository
-      chart_version           = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].version
+      name                    = "thanos"
+      chart                   = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].name
+      repository              = ""
+      chart_version           = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].version
       namespace               = "monitoring"
       create_iam_resources    = true
       iam_policy_override     = null
diff --git a/modules/google/thanos.tf b/modules/google/thanos.tf
index 71af9d028..ca51a9726 100644
--- a/modules/google/thanos.tf
+++ b/modules/google/thanos.tf
@@ -3,10 +3,10 @@ locals {
   thanos = merge(
     local.helm_defaults,
     {
-      name                    = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
-      chart                   = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
-      repository              = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].repository
-      chart_version           = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].version
+      name                    = "thanos"
+      chart                   = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].name
+      repository              = ""
+      chart_version           = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].version
       namespace               = "monitoring"
       create_iam_resources    = true
       iam_policy_override     = null
diff --git a/modules/scaleway/kube-prometheus.tf b/modules/scaleway/kube-prometheus.tf
index cabfa7ec9..2595bc63b 100644
--- a/modules/scaleway/kube-prometheus.tf
+++ b/modules/scaleway/kube-prometheus.tf
@@ -13,7 +13,7 @@ locals {
       thanos_bucket            = "thanos-store-${var.cluster-name}"
       thanos_bucket_region     = local.scaleway["region"]
       thanos_store_config      = null
-      thanos_version           = "v0.36.1"
+      thanos_version           = "v0.37.2"
       enabled                  = false
       allowed_cidrs            = ["0.0.0.0/0"]
       default_network_policy   = true
diff --git a/modules/scaleway/thanos-memcached.tf b/modules/scaleway/thanos-memcached.tf
index 362d30482..fbb7c8653 100644
--- a/modules/scaleway/thanos-memcached.tf
+++ b/modules/scaleway/thanos-memcached.tf
@@ -3,9 +3,9 @@ locals {
   thanos-memcached = merge(
     local.helm_defaults,
     {
-      chart         = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].name
-      repository    = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].repository
-      chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].version
+      chart         = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].name
+      repository    = ""
+      chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].version
       name          = "thanos-memcached"
       namespace     = local.thanos["namespace"]
       enabled       = false
diff --git a/modules/scaleway/thanos.tf b/modules/scaleway/thanos.tf
index 3f5ac6b76..9c0bf21cb 100644
--- a/modules/scaleway/thanos.tf
+++ b/modules/scaleway/thanos.tf
@@ -3,10 +3,10 @@ locals {
   thanos = merge(
     local.helm_defaults,
     {
-      name                    = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
-      chart                   = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
-      repository              = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].repository
-      chart_version           = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].version
+      name                    = "thanos"
+      chart                   = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].name
+      repository              = ""
+      chart_version           = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].version
       namespace               = "monitoring"
       iam_policy_override     = null
       create_ns               = false