diff --git a/argocd/applications/configs/edgenode-observability.yaml b/argocd/applications/configs/edgenode-observability.yaml
index d3464469f..87ff15ef3 100644
--- a/argocd/applications/configs/edgenode-observability.yaml
+++ b/argocd/applications/configs/edgenode-observability.yaml
@@ -18,6 +18,24 @@ mimir-distributed:
       exitCommand: ""
     makePolicyJob:
       exitCommand: ""
+  query_scheduler:
+    enabled: true
+  # Continue using classic architecture (disable ingest storage)
+  # https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-helm-chart-5.x-to-6.0/#continue-using-classic-architecture-disable-ingest-storage
+  kafka:
+    enabled: false
+  mimir:
+    structuredConfig:
+      ingest_storage:
+        enabled: false
+        kafka:
+          address: null
+          topic: null
+          auto_create_topic_default_partitions: null
+      distributor:
+        remote_timeout: null
+      ingester:
+        push_grpc_method_enabled: true
 
 opentelemetry-collector:
   alternateConfig:
diff --git a/argocd/applications/configs/orchestrator-observability.yaml b/argocd/applications/configs/orchestrator-observability.yaml
index 8286aaa29..b32b665c3 100644
--- a/argocd/applications/configs/orchestrator-observability.yaml
+++ b/argocd/applications/configs/orchestrator-observability.yaml
@@ -18,6 +18,24 @@ mimir-distributed:
       exitCommand: ""
     makePolicyJob:
       exitCommand: ""
+  query_scheduler:
+    enabled: true
+  # Continue using classic architecture (disable ingest storage)
+  # https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-helm-chart-5.x-to-6.0/#continue-using-classic-architecture-disable-ingest-storage
+  kafka:
+    enabled: false
+  mimir:
+    structuredConfig:
+      ingest_storage:
+        enabled: false
+        kafka:
+          address: null
+          topic: null
+          auto_create_topic_default_partitions: null
+      distributor:
+        remote_timeout: null
+      ingester:
+        push_grpc_method_enabled: true
 
 opentelemetry-collector:
   alternateConfig:
diff --git a/argocd/applications/custom/edgenode-observability.tpl b/argocd/applications/custom/edgenode-observability.tpl
index d72757d4b..bf03680fc 100644
--- a/argocd/applications/custom/edgenode-observability.tpl
+++ b/argocd/applications/custom/edgenode-observability.tpl
@@ -417,10 +417,6 @@ mimir-distributed:
       query_scheduler:
         max_outstanding_requests_per_tenant: {{ .Values.argo.o11y.edgeNode.mimir.structuredConfig.querySchedulerMaxOutstandingRequestsPerTenant }}
       {{- end }}
-      {{- if .Values.argo.o11y.edgeNode.mimir.structuredConfig.frontendMaxOutstandingRequestsPerTenant }}
-      frontend:
-        max_outstanding_per_tenant: {{ .Values.argo.o11y.edgeNode.mimir.structuredConfig.frontendMaxOutstandingRequestsPerTenant }}
-      {{- end }}
       {{- if .Values.argo.o11y.edgeNode.mimir.structuredConfig.querierTime }}
       querier:
         query_store_after: {{ .Values.argo.o11y.edgeNode.mimir.structuredConfig.querierTime }}
diff --git a/argocd/applications/custom/orchestrator-observability.tpl b/argocd/applications/custom/orchestrator-observability.tpl
index 9458cf3bd..c36a57c1e 100644
--- a/argocd/applications/custom/orchestrator-observability.tpl
+++ b/argocd/applications/custom/orchestrator-observability.tpl
@@ -190,10 +190,6 @@ mimir-distributed:
       query_scheduler:
         max_outstanding_requests_per_tenant: {{ .Values.argo.o11y.orchestrator.mimir.structuredConfig.querySchedulerMaxOutstandingRequestsPerTenant }}
       {{- end }}
-      {{- if .Values.argo.o11y.orchestrator.mimir.structuredConfig.frontendMaxOutstandingRequestsPerTenant }}
-      frontend:
-        max_outstanding_per_tenant: {{ .Values.argo.o11y.orchestrator.mimir.structuredConfig.frontendMaxOutstandingRequestsPerTenant }}
-      {{- end }}
       {{- if .Values.argo.o11y.orchestrator.mimir.structuredConfig.querierTime }}
       querier:
         query_store_after: {{ .Values.argo.o11y.orchestrator.mimir.structuredConfig.querierTime }}
diff --git a/argocd/applications/templates/edgenode-observability.yaml b/argocd/applications/templates/edgenode-observability.yaml
index aded021d6..66b5abe66 100644
--- a/argocd/applications/templates/edgenode-observability.yaml
+++ b/argocd/applications/templates/edgenode-observability.yaml
@@ -19,7 +19,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: o11y/charts/{{$appName}}
-      targetRevision: 0.10.5
+      targetRevision: 0.10.7
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/orchestrator-observability.yaml b/argocd/applications/templates/orchestrator-observability.yaml
index 5d1dd1cd2..cbbb13a84 100644
--- a/argocd/applications/templates/orchestrator-observability.yaml
+++ b/argocd/applications/templates/orchestrator-observability.yaml
@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: o11y/charts/{{$appName}}
-      targetRevision: 0.5.6
+      targetRevision: 0.5.8
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/orch-configs/profiles/o11y-release-large.yaml b/orch-configs/profiles/o11y-release-large.yaml
index dafc3edb7..a0cc17dcd 100644
--- a/orch-configs/profiles/o11y-release-large.yaml
+++ b/orch-configs/profiles/o11y-release-large.yaml
@@ -104,7 +104,6 @@ argo:
           volumeSize: 40Gi
         structuredConfig: # TODO use direct structuredConfig
            querySchedulerMaxOutstandingRequestsPerTenant: null
-           frontendMaxOutstandingRequestsPerTenant: null
            querierTime: null
            metricsRetentionPeriod: 360h
            ingestionRate: 4000000
@@ -146,7 +145,6 @@ argo:
           volumeSize: 40Gi
         structuredConfig: # TODO use direct structuredConfig
           querySchedulerMaxOutstandingRequestsPerTenant: null
-          frontendMaxOutstandingRequestsPerTenant: null
           querierTime: null
           ingestionRate: null
           ingestionBurstSize: null