diff --git a/kubernetes/microservices-mode/logs/kustomization.yaml b/kubernetes/microservices-mode/logs/kustomization.yaml
index 91b15643..6d23bcba 100644
--- a/kubernetes/microservices-mode/logs/kustomization.yaml
+++ b/kubernetes/microservices-mode/logs/kustomization.yaml
@@ -16,22 +16,21 @@ secretGenerator:
   literals:
   - LOKI_S3_SECRET_ACCESS_KEY=VD538OYxSEiGD4I9mmFfqFMCGq1vIiGm
 
-
 configMapGenerator:
-- name: grafana-datasources
+- name: agent-config
   namespace: monitoring-system
   options:
-    labels:
-      grafana_datasource: "1"
+    disableNameSuffixHash: true
   files:
-  - datasources.yaml=configs/grafana-datasources-loki.yaml
+  - configs/config.river
 
-- name: agent-config
+- name: grafana-datasources
   namespace: monitoring-system
   options:
-    disableNameSuffixHash: true
+    labels:
+      grafana_datasource: "1"
   files:
-  - configs/config.river
+  - datasources.yaml=configs/grafana-datasources-loki.yaml
 
 - name: loki-distributed
   namespace: logging-system
diff --git a/kubernetes/microservices-mode/metrics/kustomization.yaml b/kubernetes/microservices-mode/metrics/kustomization.yaml
index f58fd442..7a7c24f0 100644
--- a/kubernetes/microservices-mode/metrics/kustomization.yaml
+++ b/kubernetes/microservices-mode/metrics/kustomization.yaml
@@ -35,16 +35,16 @@ configMapGenerator:
   files:
   - datasources.yaml=configs/grafana-datasources-mimir.yaml
 
-- name: mimir-distributed-runtime
+- name: mimir-distributed-config
   namespace: monitoring-system
   behavior: replace
   files:
-  - configs/runtime.yaml
-- name: mimir-distributed-config
+  - mimir.yaml=configs/mimir-distributed.yaml
+- name: mimir-distributed-runtime
   namespace: monitoring-system
   behavior: replace
   files:
-  - mimir.yaml=configs/mimir-distributed.yaml
+  - configs/runtime.yaml
 - name: mimir-distributed-alertmanager-fallback-config
   namespace: monitoring-system
   behavior: replace
diff --git a/kubernetes/microservices-mode/profiles/kustomization.yaml b/kubernetes/microservices-mode/profiles/kustomization.yaml
index 65405591..975fc14d 100644
--- a/kubernetes/microservices-mode/profiles/kustomization.yaml
+++ b/kubernetes/microservices-mode/profiles/kustomization.yaml
@@ -11,28 +11,26 @@ resources:
 - pyroscope
 
 secretGenerator:
-# https://grafana.com/docs/pyroscope/latest/configure-server/reference-configuration-parameters/#s3_storage_backend
 - name: pyroscope-env
   namespace: profiles-system
   literals:
   - PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY=VD538OYxSEiGD4I9mmFfqFMCGq1vIiGm
 
-
 configMapGenerator:
-- name: grafana-datasources
+- name: agent-config
   namespace: monitoring-system
   options:
-    labels:
-      grafana_datasource: "1"
+    disableNameSuffixHash: true
   files:
-  - datasources.yaml=configs/grafana-datasources-pyroscope.yaml
+  - configs/config.river
 
-- name: agent-config
+- name: grafana-datasources
   namespace: monitoring-system
   options:
-    disableNameSuffixHash: true
+    labels:
+      grafana_datasource: "1"
   files:
-  - configs/config.river
+  - datasources.yaml=configs/grafana-datasources-pyroscope.yaml
 
 - name: pyroscope-config
   namespace: profiles-system
diff --git a/kubernetes/microservices-mode/traces/configs/mimir.yaml b/kubernetes/microservices-mode/traces/configs/mimir.yaml
index 719a0c99..9dcba264 100644
--- a/kubernetes/microservices-mode/traces/configs/mimir.yaml
+++ b/kubernetes/microservices-mode/traces/configs/mimir.yaml
@@ -30,7 +30,7 @@ compactor:
   tenant_cleanup_delay: 1m
 
 memberlist:
-  join_members: [ gossip-ring-headless:7946 ]
+  join_members: [ mimir-memberlist:7946 ]
 
 ingester:
   ring:
diff --git a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml
index fbb7f2c7..4ecfdcda 100644
--- a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml
+++ b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml
@@ -10372,7 +10372,7 @@ data:
       tenant_cleanup_delay: 1m
 
     memberlist:
-      join_members: [ gossip-ring-headless:7946 ]
+      join_members: [ mimir-memberlist:7946 ]
 
     ingester:
       ring:
@@ -10403,7 +10403,7 @@ data:
       native_histograms_ingestion_enabled: true
 kind: ConfigMap
 metadata:
-  name: mimir-config-k2d48ck5kh
+  name: mimir-config-t97g8cg2gc
   namespace: monitoring-system
 ---
 apiVersion: v1
@@ -44055,7 +44055,7 @@ spec:
       terminationGracePeriodSeconds: 60
       volumes:
       - configMap:
-          name: mimir-config-k2d48ck5kh
+          name: mimir-config-t97g8cg2gc
         name: mimir-config
       - configMap:
           name: runtime-config-88gg5gk88d
diff --git a/kubernetes/microservices-mode/traces/kustomization.yaml b/kubernetes/microservices-mode/traces/kustomization.yaml
index 6b6aa126..a2a1917e 100644
--- a/kubernetes/microservices-mode/traces/kustomization.yaml
+++ b/kubernetes/microservices-mode/traces/kustomization.yaml
@@ -31,14 +31,6 @@ secretGenerator:
   - MIMIR_S3_SECRET_ACCESS_KEY=VD538OYxSEiGD4I9mmFfqFMCGq1vIiGm
 
 configMapGenerator:
-- name: grafana-datasources
-  namespace: monitoring-system
-  options:
-    labels:
-      grafana_datasource: "1"
-  files:
-  - datasources.yaml=configs/grafana-datasources-tempo.yaml
-
 - name: agent-config
   namespace: monitoring-system
   options:
@@ -46,6 +38,13 @@ configMapGenerator:
   files:
   - configs/config.river
 
+- name: grafana-datasources
+  namespace: monitoring-system
+  options:
+    labels:
+      grafana_datasource: "1"
+  files:
+  - datasources.yaml=configs/grafana-datasources-tempo.yaml
 
 - name: tempo-distributed-config
   namespace: tracing-system
diff --git a/kubernetes/monolithic-mode/all-in-one/configs/mimir.yaml b/kubernetes/monolithic-mode/all-in-one/configs/mimir.yaml
index 719a0c99..9dcba264 100644
--- a/kubernetes/monolithic-mode/all-in-one/configs/mimir.yaml
+++ b/kubernetes/monolithic-mode/all-in-one/configs/mimir.yaml
@@ -30,7 +30,7 @@ compactor:
   tenant_cleanup_delay: 1m
 
 memberlist:
-  join_members: [ gossip-ring-headless:7946 ]
+  join_members: [ mimir-memberlist:7946 ]
 
 ingester:
   ring:
diff --git a/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml
index 463c906e..bd816b06 100644
--- a/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml
+++ b/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml
@@ -4593,7 +4593,7 @@ kind: ConfigMap
 metadata:
   labels:
     grafana_datasource: "1"
-  name: grafana-datasources
+  name: grafana-datasources-757dh59h8m
   namespace: monitoring-system
 ---
 apiVersion: v1
@@ -29670,7 +29670,7 @@ data:
       tenant_cleanup_delay: 1m
 
     memberlist:
-      join_members: [ gossip-ring-headless:7946 ]
+      join_members: [ mimir-memberlist:7946 ]
 
     ingester:
       ring:
@@ -29701,7 +29701,7 @@ data:
       native_histograms_ingestion_enabled: true
 kind: ConfigMap
 metadata:
-  name: mimir-config
+  name: mimir-config-t97g8cg2gc
   namespace: monitoring-system
 ---
 apiVersion: v1
@@ -62738,7 +62738,7 @@ data:
         ruler_max_rule_groups_per_tenant: 100
 kind: ConfigMap
 metadata:
-  name: runtime-config
+  name: runtime-config-88gg5gk88d
   namespace: monitoring-system
 ---
 apiVersion: v1
@@ -62892,7 +62892,7 @@ data:
   LOKI_S3_SECRET_ACCESS_KEY: VkQ1MzhPWXhTRWlHRDRJOW1tRmZxRk1DR3ExdklpR20=
 kind: Secret
 metadata:
-  name: loki-env
+  name: loki-env-58m52b99kc
   namespace: logging-system
 type: Opaque
 ---
@@ -62901,7 +62901,7 @@ data:
   MIMIR_S3_SECRET_ACCESS_KEY: VkQ1MzhPWXhTRWlHRDRJOW1tRmZxRk1DR3ExdklpR20=
 kind: Secret
 metadata:
-  name: mimir-env
+  name: mimir-env-92ddctt858
   namespace: monitoring-system
 type: Opaque
 ---
@@ -62910,7 +62910,7 @@ data:
   PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY: VkQ1MzhPWXhTRWlHRDRJOW1tRmZxRk1DR3ExdklpR20=
 kind: Secret
 metadata:
-  name: pyroscope-env
+  name: pyroscope-env-h982fgc652
   namespace: profiles-system
 type: Opaque
 ---
@@ -62924,7 +62924,7 @@ data:
   TEMPO_S3_SECRET_KEY: VkQ1MzhPWXhTRWlHRDRJOW1tRmZxRk1DR3ExdklpR20=
 kind: Secret
 metadata:
-  name: tempo-env
+  name: tempo-env-gk54k88t7g
   namespace: tracing-system
 type: Opaque
 ---
@@ -63240,7 +63240,7 @@ spec:
               fieldPath: status.podIP
         envFrom:
         - secretRef:
-            name: mimir-env
+            name: mimir-env-92ddctt858
         image: docker.io/grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: mimir
@@ -63270,10 +63270,10 @@ spec:
       terminationGracePeriodSeconds: 60
       volumes:
       - configMap:
-          name: mimir-config
+          name: mimir-config-t97g8cg2gc
         name: mimir-config
       - configMap:
-          name: runtime-config
+          name: runtime-config-88gg5gk88d
         name: runtime-config
 ---
 apiVersion: apps/v1
@@ -63338,7 +63338,7 @@ spec:
         - -config.expand-env=true
         envFrom:
         - secretRef:
-            name: loki-env
+            name: loki-env-58m52b99kc
         image: docker.io/grafana/loki:2.9.5
         imagePullPolicy: IfNotPresent
         name: loki
@@ -63460,7 +63460,7 @@ spec:
         - -log.level=debug
         envFrom:
         - secretRef:
-            name: pyroscope-env
+            name: pyroscope-env-h982fgc652
         image: grafana/pyroscope:1.4.0
         imagePullPolicy: IfNotPresent
         name: pyroscope
@@ -63545,7 +63545,7 @@ spec:
         - -config.expand-env=true
         envFrom:
         - secretRef:
-            name: tempo-env
+            name: tempo-env-gk54k88t7g
         image: grafana/tempo:2.4.0
         imagePullPolicy: IfNotPresent
         name: tempo
diff --git a/kubernetes/monolithic-mode/all-in-one/kustomization.yaml b/kubernetes/monolithic-mode/all-in-one/kustomization.yaml
index 11b89293..24d1c21c 100644
--- a/kubernetes/monolithic-mode/all-in-one/kustomization.yaml
+++ b/kubernetes/monolithic-mode/all-in-one/kustomization.yaml
@@ -19,9 +19,6 @@ resources:
 - ../../../monitoring-mixins/mimir-mixin/deploy
 # - ../../../monitoring-mixins/tempo-mixin/deploy
 
-generatorOptions:
-  disableNameSuffixHash: true
-
 secretGenerator:
 - name: loki-env
   namespace: logging-system
@@ -49,20 +46,20 @@ secretGenerator:
   - PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY=VD538OYxSEiGD4I9mmFfqFMCGq1vIiGm
 
 configMapGenerator:
-- name: grafana-datasources
+- name: agent-config
   namespace: monitoring-system
   options:
-    labels:
-      grafana_datasource: "1"
+    disableNameSuffixHash: true
   files:
-  - datasources.yaml=configs/grafana-datasources-all-in-one.yaml
+  - configs/config.river
 
-- name: agent-config
+- name: grafana-datasources
   namespace: monitoring-system
   options:
-    disableNameSuffixHash: true
+    labels:
+      grafana_datasource: "1"
   files:
-  - configs/config.river
+  - datasources.yaml=configs/grafana-datasources-all-in-one.yaml
 
 - name: loki-config
   namespace: logging-system
@@ -70,6 +67,13 @@ configMapGenerator:
   files:
   - config.yaml=configs/loki.yaml
 
+- name: tempo
+  namespace: tracing-system
+  behavior: replace
+  files:
+  - configs/tempo.yaml
+  - overrides.yaml=configs/tempo-overrides.yaml
+
 - name: mimir-config
   namespace: monitoring-system
   files:
@@ -85,16 +89,11 @@ configMapGenerator:
   files:
   - config.yaml=configs/pyroscope.yaml
 
-- name: tempo
-  namespace: tracing-system
-  behavior: replace
-  files:
-  - configs/tempo.yaml
-  - overrides.yaml=configs/tempo-overrides.yaml
-
 # replace nginx-templates and nginx-env configMap
 - name: nginx-templates
   namespace: gateway
+  options:
+    disableNameSuffixHash: true
   files:
   - configs/gateway_loki.conf.template
   - configs/gateway_mimir.conf.template
@@ -102,5 +101,7 @@ configMapGenerator:
   - configs/gateway_tempo.conf.template
 - name: nginx-env
   namespace: gateway
+  options:
+    disableNameSuffixHash: true
   envs:
   - configs/nginx.env
diff --git a/kubernetes/monolithic-mode/logs/kustomization.yaml b/kubernetes/monolithic-mode/logs/kustomization.yaml
index f3541db2..27229821 100644
--- a/kubernetes/monolithic-mode/logs/kustomization.yaml
+++ b/kubernetes/monolithic-mode/logs/kustomization.yaml
@@ -23,20 +23,20 @@ secretGenerator:
   - LOKI_S3_SECRET_ACCESS_KEY=VD538OYxSEiGD4I9mmFfqFMCGq1vIiGm
 
 configMapGenerator:
-- name: grafana-datasources
+- name: agent-config
   namespace: monitoring-system
   options:
-    labels:
-      grafana_datasource: "1"
+    disableNameSuffixHash: true
   files:
-  - datasources.yaml=configs/grafana-datasources-loki.yaml
+  - configs/config.river
 
-- name: agent-config
+- name: grafana-datasources
   namespace: monitoring-system
   options:
-    disableNameSuffixHash: true
+    labels:
+      grafana_datasource: "1"
   files:
-  - configs/config.river
+  - datasources.yaml=configs/grafana-datasources-loki.yaml
 
 - name: loki-config
   namespace: logging-system
diff --git a/kubernetes/monolithic-mode/profiles/kustomization.yaml b/kubernetes/monolithic-mode/profiles/kustomization.yaml
index 6974b467..e719e217 100644
--- a/kubernetes/monolithic-mode/profiles/kustomization.yaml
+++ b/kubernetes/monolithic-mode/profiles/kustomization.yaml
@@ -11,27 +11,26 @@ resources:
 - pyroscope
 
 secretGenerator:
-# https://grafana.com/docs/pyroscope/latest/configure-server/reference-configuration-parameters/#s3_storage_backend
 - name: pyroscope-env
   namespace: profiles-system
   literals:
   - PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY=VD538OYxSEiGD4I9mmFfqFMCGq1vIiGm
 
 configMapGenerator:
-- name: grafana-datasources
+- name: agent-config
   namespace: monitoring-system
   options:
-    labels:
-      grafana_datasource: "1"
+    disableNameSuffixHash: true
   files:
-  - datasources.yaml=configs/grafana-datasources-pyroscope.yaml
+  - configs/config.river
 
-- name: agent-config
+- name: grafana-datasources
   namespace: monitoring-system
   options:
-    disableNameSuffixHash: true
+    labels:
+      grafana_datasource: "1"
   files:
-  - configs/config.river
+  - datasources.yaml=configs/grafana-datasources-pyroscope.yaml
 
 - name: pyroscope-config
   namespace: profiles-system
diff --git a/kubernetes/monolithic-mode/traces/configs/mimir.yaml b/kubernetes/monolithic-mode/traces/configs/mimir.yaml
index 719a0c99..9dcba264 100644
--- a/kubernetes/monolithic-mode/traces/configs/mimir.yaml
+++ b/kubernetes/monolithic-mode/traces/configs/mimir.yaml
@@ -30,7 +30,7 @@ compactor:
   tenant_cleanup_delay: 1m
 
 memberlist:
-  join_members: [ gossip-ring-headless:7946 ]
+  join_members: [ mimir-memberlist:7946 ]
 
 ingester:
   ring:
diff --git a/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml
index 8d376f0c..021ae521 100644
--- a/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml
+++ b/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml
@@ -10372,7 +10372,7 @@ data:
       tenant_cleanup_delay: 1m
 
     memberlist:
-      join_members: [ gossip-ring-headless:7946 ]
+      join_members: [ mimir-memberlist:7946 ]
 
     ingester:
       ring:
@@ -10403,7 +10403,7 @@ data:
       native_histograms_ingestion_enabled: true
 kind: ConfigMap
 metadata:
-  name: mimir-config-k2d48ck5kh
+  name: mimir-config-t97g8cg2gc
   namespace: monitoring-system
 ---
 apiVersion: v1
@@ -43763,7 +43763,7 @@ spec:
       terminationGracePeriodSeconds: 60
       volumes:
       - configMap:
-          name: mimir-config-k2d48ck5kh
+          name: mimir-config-t97g8cg2gc
         name: mimir-config
       - configMap:
           name: runtime-config-88gg5gk88d
diff --git a/kubernetes/monolithic-mode/traces/kustomization.yaml b/kubernetes/monolithic-mode/traces/kustomization.yaml
index 2e74924a..d351181d 100644
--- a/kubernetes/monolithic-mode/traces/kustomization.yaml
+++ b/kubernetes/monolithic-mode/traces/kustomization.yaml
@@ -32,20 +32,20 @@ secretGenerator:
   - MIMIR_S3_SECRET_ACCESS_KEY=VD538OYxSEiGD4I9mmFfqFMCGq1vIiGm
 
 configMapGenerator:
-- name: grafana-datasources
+- name: agent-config
   namespace: monitoring-system
   options:
-    labels:
-      grafana_datasource: "1"
+    disableNameSuffixHash: true
   files:
-  - datasources.yaml=configs/grafana-datasources-tempo.yaml
+  - configs/config.river
 
-- name: agent-config
+- name: grafana-datasources
   namespace: monitoring-system
   options:
-    disableNameSuffixHash: true
+    labels:
+      grafana_datasource: "1"
   files:
-  - configs/config.river
+  - datasources.yaml=configs/grafana-datasources-tempo.yaml
 
 - name: tempo
   namespace: tracing-system
diff --git a/kubernetes/read-write-mode/logs/kustomization.yaml b/kubernetes/read-write-mode/logs/kustomization.yaml
index 3a693a39..daa06f17 100644
--- a/kubernetes/read-write-mode/logs/kustomization.yaml
+++ b/kubernetes/read-write-mode/logs/kustomization.yaml
@@ -17,20 +17,20 @@ secretGenerator:
   - LOKI_S3_SECRET_ACCESS_KEY=VD538OYxSEiGD4I9mmFfqFMCGq1vIiGm
 
 configMapGenerator:
-- name: grafana-datasources
+- name: agent-config
   namespace: monitoring-system
   options:
-    labels:
-      grafana_datasource: "1"
+    disableNameSuffixHash: true
   files:
-  - datasources.yaml=configs/grafana-datasources-loki.yaml
+  - configs/config.river
 
-- name: agent-config
+- name: grafana-datasources
   namespace: monitoring-system
   options:
-    disableNameSuffixHash: true
+    labels:
+      grafana_datasource: "1"
   files:
-  - configs/config.river
+  - datasources.yaml=configs/grafana-datasources-loki.yaml
 
 - name: loki-config
   namespace: logging-system