diff --git a/bootstrap/platform/main.tf b/bootstrap/platform/main.tf
index b1056c8..9cc4e24 100644
--- a/bootstrap/platform/main.tf
+++ b/bootstrap/platform/main.tf
@@ -931,6 +931,8 @@ resource "helm_release" "loki" {
 }
 
 resource "helm_release" "mimir" {
+  count = var.observability.mimir.enabled ? 1 : 0
+
   depends_on       = [kubernetes_namespace_v1.monitoring]
   name             = "mimir"
   repository       = var.observability.mimir.repository
@@ -1145,7 +1147,7 @@ resource "helm_release" "prometheus_stack" {
               memory = "1Gi"
             }
           }
-          remoteWrite = var.observability.prometheus.remote_write_mimir_enabled ? [
+          remoteWrite = var.observability.mimir.enabled && var.observability.prometheus.remote_write_mimir_enabled ? [
             {
               url = "http://mimir-nginx.${var.observability.namespace}.svc/api/v1/push"
             }
@@ -1173,22 +1175,26 @@ resource "helm_release" "prometheus_stack" {
           accessModes      = ["ReadWriteOnce"]
           size             = var.observability.prometheus.grafana_storage_size
         }
-        additionalDataSources = [
-          {
-            name      = "Loki"
-            type      = "loki"
-            access    = "proxy"
-            url       = "http://loki.${var.observability.namespace}.svc:3100"
-            isDefault = false
-          },
-          {
-            name      = "Mimir"
-            type      = "prometheus"
-            access    = "proxy"
-            url       = "http://mimir-nginx.${var.observability.namespace}.svc/prometheus"
-            isDefault = false
-          }
-        ]
+        additionalDataSources = concat(
+          [
+            {
+              name      = "Loki"
+              type      = "loki"
+              access    = "proxy"
+              url       = "http://loki.${var.observability.namespace}.svc:3100"
+              isDefault = false
+            }
+          ],
+          var.observability.mimir.enabled ? [
+            {
+              name      = "Mimir"
+              type      = "prometheus"
+              access    = "proxy"
+              url       = "http://mimir-nginx.${var.observability.namespace}.svc/prometheus"
+              isDefault = false
+            }
+          ] : []
+        )
         resources = {
           requests = {
             cpu    = "50m"
diff --git a/bootstrap/platform/variables.tf b/bootstrap/platform/variables.tf
index 1f7acbf..2ccc19c 100644
--- a/bootstrap/platform/variables.tf
+++ b/bootstrap/platform/variables.tf
@@ -160,6 +160,7 @@ variable "observability" {
       version    = string
     })
     mimir = object({
+      enabled                    = optional(bool, false)
       repository                 = string
       chart                      = string
       version                    = string
@@ -196,6 +197,7 @@ variable "observability" {
       version    = "6.17.1"
     }
     mimir = {
+      enabled                    = false
       repository                 = "https://grafana.github.io/helm-charts"
       chart                      = "mimir-distributed"
       version                    = "5.8.0"