diff --git a/operations/compare-helm-with-jsonnet/components/config/kustomization.yaml b/operations/compare-helm-with-jsonnet/components/config/kustomization.yaml
index 34b92edbf7e..ff0cb29b259 100644
--- a/operations/compare-helm-with-jsonnet/components/config/kustomization.yaml
+++ b/operations/compare-helm-with-jsonnet/components/config/kustomization.yaml
@@ -148,14 +148,6 @@ patches:
       - op: remove
         path: /config/limits/max_total_query_length
 
-  - target:
-      kind: MimirConfig
-      name: 'alertmanager|compactor|ingester|overrides-exporter|querier|query-frontend|query-scheduler|ruler|store-gateway'
-    patch: |-
-      # Only applied to distributors in jsonnet, remove from the rest
-      - op: remove
-        path: /config/server/grpc_server_max_connection_idle
-
   - target:
       kind: MimirConfig
       name: 'alertmanager|compactor|distributor|ingester|overrides-exporter|querier|query-frontend|query-scheduler|ruler|store-gateway'
diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md
index a19197d5a20..f7a400e5eb7 100644
--- a/operations/helm/charts/mimir-distributed/CHANGELOG.md
+++ b/operations/helm/charts/mimir-distributed/CHANGELOG.md
@@ -40,6 +40,7 @@ Entries should include a reference to the Pull Request that introduced the chang
   * `-compactor.ring.heartbeat-timeout` set to `4m`
 * [CHANGE] Ruler: Set `-distributor.remote-timeout` to 10s in order to accommodate writing large rule results to the ingester. #7143
 * [CHANGE] Remove `-server.grpc.keepalive.max-connection-age` and `-server.grpc.keepalive.max-connection-age-grace` from default config. The configuration now applied directly to distributor, fixing parity with jsonnet. #7269
+* [CHANGE] Remove `-server.grpc.keepalive.max-connection-idle` from default config. The configuration now applied directly to distributor, fixing parity with jsonnet. #7298
 * [ENHANCEMENT] Add `jaegerReporterMaxQueueSize` Helm value for all components where configuring `JAEGER_REPORTER_MAX_QUEUE_SIZE` makes sense, and override the Jaeger client's default value of 100 for components expected to generate many trace spans. #7068 #7086 #7259
 * [ENHANCEMENT] Rollout-operator: upgraded to v0.10.1. #7125
 * [ENHANCEMENT] Query-frontend: configured `-shutdown-delay`, `-server.grpc.keepalive.max-connection-age` and termination grace period to reduce the likelihood of queries hitting terminated query-frontends. #7129
diff --git a/operations/helm/charts/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/charts/mimir-distributed/templates/distributor/distributor-dep.yaml
index e3d56d679cb..49bed7795a4 100644
--- a/operations/helm/charts/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/charts/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -50,6 +50,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           {{- if .Values.ingester.zoneAwareReplication.migration.enabled }}
             {{- if not .Values.ingester.zoneAwareReplication.migration.writePath }}
             - "-ingester.ring.zone-awareness-enabled=false"
diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml
index 68642a4bf26..a877fb2489d 100644
--- a/operations/helm/charts/mimir-distributed/values.yaml
+++ b/operations/helm/charts/mimir-distributed/values.yaml
@@ -374,9 +374,6 @@ mimir:
     runtime_config:
       file: /var/{{ include "mimir.name" . }}/runtime.yaml
 
-    server:
-      grpc_server_max_connection_idle: 1m
-
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 94d787e0eb5..cf3b4071c4f 100644
--- a/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
               
             - mountPath: /certs
diff --git a/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml
index 86c285505e9..1024b546eaa 100644
--- a/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -286,7 +286,6 @@ data:
     runtime_config:
       file: /var/mimir/runtime.yaml
     server:
-      grpc_server_max_connection_idle: 1m
       grpc_tls_config:
         cert_file: /certs/tls.crt
         client_auth_type: VerifyClientCertIfGiven
diff --git a/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 656068d059e..52b79e8b291 100644
--- a/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml
index ba784659a03..412608d3bd5 100644
--- a/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -148,8 +148,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 854aeb94280..8e1fe2c805a 100644
--- a/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml
index 0c60ea4b349..065ab99e774 100644
--- a/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -104,8 +104,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 441921c9e62..b2048a820e1 100644
--- a/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/mimir-config.yaml
index 3d5d642abc9..fa25deb1690 100644
--- a/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -171,8 +171,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/large-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/large-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 46e3ee0d4db..38541f7fcf7 100644
--- a/operations/helm/tests/large-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/large-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/large-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/large-values-generated/mimir-distributed/templates/mimir-config.yaml
index a1f82445cf8..11d240c4e36 100644
--- a/operations/helm/tests/large-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/large-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -116,8 +116,6 @@ data:
           max_item_size: 1048576
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 4d04662ec1e..6a0fe2e4927 100644
--- a/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml
index f39216b0c5a..921d9fbdaf5 100644
--- a/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -103,8 +103,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 95b00ad42fb..f4f45f4a419 100644
--- a/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -54,6 +54,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml
index 6ef216249fe..0af1eb414d7 100644
--- a/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -119,8 +119,6 @@ data:
       rule_path: /data
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 982401618a6..779f5d384ef 100644
--- a/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml
index 75c8af39389..616c51a6556 100644
--- a/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -82,8 +82,6 @@ data:
       rule_path: /data
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/small-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/small-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 22c0da2509c..b1c84cdfdfe 100644
--- a/operations/helm/tests/small-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/small-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/small-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/small-values-generated/mimir-distributed/templates/mimir-config.yaml
index 2e98865c430..ea2c7412726 100644
--- a/operations/helm/tests/small-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/small-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -116,8 +116,6 @@ data:
           max_item_size: 1048576
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 94835135732..b712371ef5e 100644
--- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -58,6 +58,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/mimir-config.yaml
index af22c774bba..3829153e54a 100644
--- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -147,8 +147,6 @@ data:
         secret_access_key: ${MINIO_ROOT_PASSWORD}
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index a1bcd56a193..2b90790e41e 100644
--- a/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml
index 2a53f24f944..e21975559c7 100644
--- a/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -148,8 +148,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 447b9367fb2..7a7e8f94b28 100644
--- a/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -54,6 +54,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/mimir-config.yaml
index d73d36761ff..f64b9034a2c 100644
--- a/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -10,4 +10,4 @@ metadata:
     release: test-enterprise-legacy-label-values
   namespace: "citestns"
 data:
-  mimir.yaml: YWN0aXZpdHlfdHJhY2tlcjoKICBmaWxlcGF0aDogL2FjdGl2ZS1xdWVyeS10cmFja2VyL2FjdGl2aXR5LmxvZwphZG1pbl9hcGk6CiAgbGVhZGVyX2VsZWN0aW9uOgogICAgZW5hYmxlZDogdHJ1ZQogICAgcmluZzoKICAgICAga3ZzdG9yZToKICAgICAgICBzdG9yZTogbWVtYmVybGlzdAphZG1pbl9jbGllbnQ6CiAgc3RvcmFnZToKICAgIHMzOgogICAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICAgIGJ1Y2tldF9uYW1lOiBlbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4KICAgICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICAgIGluc2VjdXJlOiB0cnVlCiAgICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgdHlwZTogczMKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAvZGF0YQogIGVuYWJsZV9hcGk6IHRydWUKICBleHRlcm5hbF91cmw6IC9hbGVydG1hbmFnZXIKICBmYWxsYmFja19jb25maWdfZmlsZTogL2NvbmZpZ3MvYWxlcnRtYW5hZ2VyX2ZhbGxiYWNrX2NvbmZpZy55YW1sCmFsZXJ0bWFuYWdlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBidWNrZXRfbmFtZTogZW50ZXJwcmlzZS1tZXRyaWNzLXJ1bGVyCiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKYXV0aDoKICB0eXBlOiBlbnRlcnByaXNlCmJsb2Nrc19zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IGVudGVycHJpc2UtbWV0cmljcy10c2RiCiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICB0c2RiOgogICAgZGlyOiAvZGF0YS90c2RiCiAgICBoZWFkX2NvbXBhY3Rpb25faW50ZXJ2YWw6IDE1bQogICAgd2FsX3JlcGxheV9jb25jdXJyZW5jeTogMwpjbHVzdGVyX25hbWU6IHRlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzCmNvbXBhY3RvcjoKICBjb21wYWN0aW9uX2ludGVydmFsOiAzMG0KICBkYXRhX2RpcjogL2RhdGEKICBkZWxldGlvbl9kZWxheTogMmgKICBmaXJzdF9sZXZlbF9jb21wYWN0aW9uX3dhaXRfcGVyaW9kOiAyNW0KICBtYXhfY2xvc2luZ19ibG9ja3NfY29uY3VycmVuY3k6IDIKICBtYXhfb3BlbmluZ19ibG9ja3NfY29uY3VycmVuY3k6IDQKICBzaGFyZGluZ19yaW5nOgogICAgaGVhcnRiZWF0X3BlcmlvZDogMW0KICAgIGhlYXJ0YmVhdF90aW1lb3V0OiA0bQogICAgd2FpdF9zdGFiaWxpdHlfbWluX2R1cmF0aW9uOiAxbQogIHN5bWJvbHNfZmx1c2hlcnNfY29uY3VycmVuY3k6IDQKZGlzdHJpYnV0b3I6CiAgcmluZzoKICAgIGhlYXJ0YmVhdF9wZXJpb2Q6IDFtCiAgICBoZWFydGJlYXRfdGltZW91dDogNG0KZnJvbnRlbmQ6CiAgcGFyYWxsZWxpemVfc2hhcmRhYmxlX3F1ZXJpZXM6IHRydWUKICBzY2hlZHVsZXJfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLXF1ZXJ5LXNjaGVkdWxlci1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6OTA5NQpmcm9udGVuZF93b3JrZXI6CiAgZ3JwY19jbGllbnRfY29uZmlnOgogICAgbWF4X3NlbmRfbXNnX3NpemU6IDQxOTQzMDQwMAogIHNjaGVkdWxlcl9hZGRyZXNzOiB0ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtcXVlcnktc2NoZWR1bGVyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yzo5MDk1CmdhdGV3YXk6CiAgcHJveHk6CiAgICBhZG1pbl9hcGk6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzLWVudGVycHJpc2UtbWV0cmljcy1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFsZXJ0bWFuYWdlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWFsZXJ0bWFuYWdlci1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6ODA4MAogICAgY29tcGFjdG9yOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtY29tcGFjdG9yLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkZWZhdWx0OgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4tYXBpLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkaXN0cmlidXRvcjoKICAgICAgdXJsOiBkbnM6Ly8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWRpc3RyaWJ1dG9yLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsLjo5MDk1CiAgICBpbmdlc3RlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWluZ2VzdGVyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBxdWVyeV9mcm9udGVuZDoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLXF1ZXJ5LWZyb250ZW5kLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBydWxlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLXJ1bGVyLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBzdG9yZV9nYXRld2F5OgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3Mtc3RvcmUtZ2F0ZXdheS1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6ODA4MAppbmdlc3RlcjoKICByaW5nOgogICAgZmluYWxfc2xlZXA6IDBzCiAgICBoZWFydGJlYXRfcGVyaW9kOiAybQogICAgaGVhcnRiZWF0X3RpbWVvdXQ6IDEwbQogICAgbnVtX3Rva2VuczogNTEyCiAgICB0b2tlbnNfZmlsZV9wYXRoOiAvZGF0YS90b2tlbnMKICAgIHVucmVnaXN0ZXJfb25fc2h1dGRvd246IGZhbHNlCiAgICB6b25lX2F3YXJlbmVzc19lbmFibGVkOiB0cnVlCmluZ2VzdGVyX2NsaWVudDoKICBncnBjX2NsaWVudF9jb25maWc6CiAgICBtYXhfcmVjdl9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgICBtYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCmluc3RydW1lbnRhdGlvbjoKICBkaXN0cmlidXRvcl9jbGllbnQ6CiAgICBhZGRyZXNzOiBkbnM6Ly8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWRpc3RyaWJ1dG9yLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsLjo5MDk1CiAgZW5hYmxlZDogdHJ1ZQpsaWNlbnNlOgogIHBhdGg6IC9saWNlbnNlL2xpY2Vuc2Uuand0CmxpbWl0czoKICBtYXhfY2FjaGVfZnJlc2huZXNzOiAxMG0KICBtYXhfcXVlcnlfcGFyYWxsZWxpc206IDI0MAogIG1heF90b3RhbF9xdWVyeV9sZW5ndGg6IDEyMDAwaAptZW1iZXJsaXN0OgogIGFib3J0X2lmX2NsdXN0ZXJfam9pbl9mYWlsczogZmFsc2UKICBjb21wcmVzc2lvbl9lbmFibGVkOiBmYWxzZQogIGpvaW5fbWVtYmVyczoKICAtIGRucyt0ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtZ29zc2lwLXJpbmcuY2l0ZXN0bnMuc3ZjLmNsdXN0ZXIubG9jYWwuOjc5NDYKcXVlcmllcjoKICBtYXhfY29uY3VycmVudDogMTYKcXVlcnlfc2NoZWR1bGVyOgogIG1heF9vdXRzdGFuZGluZ19yZXF1ZXN0c19wZXJfdGVuYW50OiA4MDAKcnVsZXI6CiAgYWxlcnRtYW5hZ2VyX3VybDogZG5zc3J2bm9hK2h0dHA6Ly9faHR0cC1tZXRyaWNzLl90Y3AudGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWFsZXJ0bWFuYWdlci1oZWFkbGVzcy5jaXRlc3Rucy5zdmMuY2x1c3Rlci5sb2NhbC4vYWxlcnRtYW5hZ2VyCiAgZW5hYmxlX2FwaTogdHJ1ZQogIHJ1bGVfcGF0aDogL2RhdGEKcnVsZXJfc3RvcmFnZToKICBiYWNrZW5kOiBzMwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IGVudGVycHJpc2UtbWV0cmljcy1ydWxlcgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBpbnNlY3VyZTogdHJ1ZQogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CnJ1bnRpbWVfY29uZmlnOgogIGZpbGU6IC92YXIvZW50ZXJwcmlzZS1tZXRyaWNzL3J1bnRpbWUueWFtbApzZXJ2ZXI6CiAgZ3JwY19zZXJ2ZXJfbWF4X2Nvbm5lY3Rpb25faWRsZTogMW0Kc3RvcmVfZ2F0ZXdheToKICBzaGFyZGluZ19yaW5nOgogICAgaGVhcnRiZWF0X3BlcmlvZDogMW0KICAgIGhlYXJ0YmVhdF90aW1lb3V0OiA0bQogICAga3ZzdG9yZToKICAgICAgcHJlZml4OiBtdWx0aS16b25lLwogICAgdG9rZW5zX2ZpbGVfcGF0aDogL2RhdGEvdG9rZW5zCiAgICB1bnJlZ2lzdGVyX29uX3NodXRkb3duOiBmYWxzZQogICAgd2FpdF9zdGFiaWxpdHlfbWluX2R1cmF0aW9uOiAxbQogICAgem9uZV9hd2FyZW5lc3NfZW5hYmxlZDogdHJ1ZQp1c2FnZV9zdGF0czoKICBpbnN0YWxsYXRpb25fbW9kZTogaGVsbQ==
+  mimir.yaml: YWN0aXZpdHlfdHJhY2tlcjoKICBmaWxlcGF0aDogL2FjdGl2ZS1xdWVyeS10cmFja2VyL2FjdGl2aXR5LmxvZwphZG1pbl9hcGk6CiAgbGVhZGVyX2VsZWN0aW9uOgogICAgZW5hYmxlZDogdHJ1ZQogICAgcmluZzoKICAgICAga3ZzdG9yZToKICAgICAgICBzdG9yZTogbWVtYmVybGlzdAphZG1pbl9jbGllbnQ6CiAgc3RvcmFnZToKICAgIHMzOgogICAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICAgIGJ1Y2tldF9uYW1lOiBlbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4KICAgICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICAgIGluc2VjdXJlOiB0cnVlCiAgICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgdHlwZTogczMKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAvZGF0YQogIGVuYWJsZV9hcGk6IHRydWUKICBleHRlcm5hbF91cmw6IC9hbGVydG1hbmFnZXIKICBmYWxsYmFja19jb25maWdfZmlsZTogL2NvbmZpZ3MvYWxlcnRtYW5hZ2VyX2ZhbGxiYWNrX2NvbmZpZy55YW1sCmFsZXJ0bWFuYWdlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBidWNrZXRfbmFtZTogZW50ZXJwcmlzZS1tZXRyaWNzLXJ1bGVyCiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKYXV0aDoKICB0eXBlOiBlbnRlcnByaXNlCmJsb2Nrc19zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IGVudGVycHJpc2UtbWV0cmljcy10c2RiCiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICB0c2RiOgogICAgZGlyOiAvZGF0YS90c2RiCiAgICBoZWFkX2NvbXBhY3Rpb25faW50ZXJ2YWw6IDE1bQogICAgd2FsX3JlcGxheV9jb25jdXJyZW5jeTogMwpjbHVzdGVyX25hbWU6IHRlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzCmNvbXBhY3RvcjoKICBjb21wYWN0aW9uX2ludGVydmFsOiAzMG0KICBkYXRhX2RpcjogL2RhdGEKICBkZWxldGlvbl9kZWxheTogMmgKICBmaXJzdF9sZXZlbF9jb21wYWN0aW9uX3dhaXRfcGVyaW9kOiAyNW0KICBtYXhfY2xvc2luZ19ibG9ja3NfY29uY3VycmVuY3k6IDIKICBtYXhfb3BlbmluZ19ibG9ja3NfY29uY3VycmVuY3k6IDQKICBzaGFyZGluZ19yaW5nOgogICAgaGVhcnRiZWF0X3BlcmlvZDogMW0KICAgIGhlYXJ0YmVhdF90aW1lb3V0OiA0bQogICAgd2FpdF9zdGFiaWxpdHlfbWluX2R1cmF0aW9uOiAxbQogIHN5bWJvbHNfZmx1c2hlcnNfY29uY3VycmVuY3k6IDQKZGlzdHJpYnV0b3I6CiAgcmluZzoKICAgIGhlYXJ0YmVhdF9wZXJpb2Q6IDFtCiAgICBoZWFydGJlYXRfdGltZW91dDogNG0KZnJvbnRlbmQ6CiAgcGFyYWxsZWxpemVfc2hhcmRhYmxlX3F1ZXJpZXM6IHRydWUKICBzY2hlZHVsZXJfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLXF1ZXJ5LXNjaGVkdWxlci1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6OTA5NQpmcm9udGVuZF93b3JrZXI6CiAgZ3JwY19jbGllbnRfY29uZmlnOgogICAgbWF4X3NlbmRfbXNnX3NpemU6IDQxOTQzMDQwMAogIHNjaGVkdWxlcl9hZGRyZXNzOiB0ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtcXVlcnktc2NoZWR1bGVyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yzo5MDk1CmdhdGV3YXk6CiAgcHJveHk6CiAgICBhZG1pbl9hcGk6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzLWVudGVycHJpc2UtbWV0cmljcy1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFsZXJ0bWFuYWdlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWFsZXJ0bWFuYWdlci1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6ODA4MAogICAgY29tcGFjdG9yOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtY29tcGFjdG9yLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkZWZhdWx0OgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4tYXBpLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkaXN0cmlidXRvcjoKICAgICAgdXJsOiBkbnM6Ly8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWRpc3RyaWJ1dG9yLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsLjo5MDk1CiAgICBpbmdlc3RlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWluZ2VzdGVyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBxdWVyeV9mcm9udGVuZDoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLXF1ZXJ5LWZyb250ZW5kLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBydWxlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLXJ1bGVyLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBzdG9yZV9nYXRld2F5OgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3Mtc3RvcmUtZ2F0ZXdheS1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6ODA4MAppbmdlc3RlcjoKICByaW5nOgogICAgZmluYWxfc2xlZXA6IDBzCiAgICBoZWFydGJlYXRfcGVyaW9kOiAybQogICAgaGVhcnRiZWF0X3RpbWVvdXQ6IDEwbQogICAgbnVtX3Rva2VuczogNTEyCiAgICB0b2tlbnNfZmlsZV9wYXRoOiAvZGF0YS90b2tlbnMKICAgIHVucmVnaXN0ZXJfb25fc2h1dGRvd246IGZhbHNlCiAgICB6b25lX2F3YXJlbmVzc19lbmFibGVkOiB0cnVlCmluZ2VzdGVyX2NsaWVudDoKICBncnBjX2NsaWVudF9jb25maWc6CiAgICBtYXhfcmVjdl9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgICBtYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCmluc3RydW1lbnRhdGlvbjoKICBkaXN0cmlidXRvcl9jbGllbnQ6CiAgICBhZGRyZXNzOiBkbnM6Ly8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWRpc3RyaWJ1dG9yLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsLjo5MDk1CiAgZW5hYmxlZDogdHJ1ZQpsaWNlbnNlOgogIHBhdGg6IC9saWNlbnNlL2xpY2Vuc2Uuand0CmxpbWl0czoKICBtYXhfY2FjaGVfZnJlc2huZXNzOiAxMG0KICBtYXhfcXVlcnlfcGFyYWxsZWxpc206IDI0MAogIG1heF90b3RhbF9xdWVyeV9sZW5ndGg6IDEyMDAwaAptZW1iZXJsaXN0OgogIGFib3J0X2lmX2NsdXN0ZXJfam9pbl9mYWlsczogZmFsc2UKICBjb21wcmVzc2lvbl9lbmFibGVkOiBmYWxzZQogIGpvaW5fbWVtYmVyczoKICAtIGRucyt0ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtZ29zc2lwLXJpbmcuY2l0ZXN0bnMuc3ZjLmNsdXN0ZXIubG9jYWwuOjc5NDYKcXVlcmllcjoKICBtYXhfY29uY3VycmVudDogMTYKcXVlcnlfc2NoZWR1bGVyOgogIG1heF9vdXRzdGFuZGluZ19yZXF1ZXN0c19wZXJfdGVuYW50OiA4MDAKcnVsZXI6CiAgYWxlcnRtYW5hZ2VyX3VybDogZG5zc3J2bm9hK2h0dHA6Ly9faHR0cC1tZXRyaWNzLl90Y3AudGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWFsZXJ0bWFuYWdlci1oZWFkbGVzcy5jaXRlc3Rucy5zdmMuY2x1c3Rlci5sb2NhbC4vYWxlcnRtYW5hZ2VyCiAgZW5hYmxlX2FwaTogdHJ1ZQogIHJ1bGVfcGF0aDogL2RhdGEKcnVsZXJfc3RvcmFnZToKICBiYWNrZW5kOiBzMwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IGVudGVycHJpc2UtbWV0cmljcy1ydWxlcgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBpbnNlY3VyZTogdHJ1ZQogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CnJ1bnRpbWVfY29uZmlnOgogIGZpbGU6IC92YXIvZW50ZXJwcmlzZS1tZXRyaWNzL3J1bnRpbWUueWFtbApzdG9yZV9nYXRld2F5OgogIHNoYXJkaW5nX3Jpbmc6CiAgICBoZWFydGJlYXRfcGVyaW9kOiAxbQogICAgaGVhcnRiZWF0X3RpbWVvdXQ6IDRtCiAgICBrdnN0b3JlOgogICAgICBwcmVmaXg6IG11bHRpLXpvbmUvCiAgICB0b2tlbnNfZmlsZV9wYXRoOiAvZGF0YS90b2tlbnMKICAgIHVucmVnaXN0ZXJfb25fc2h1dGRvd246IGZhbHNlCiAgICB3YWl0X3N0YWJpbGl0eV9taW5fZHVyYXRpb246IDFtCiAgICB6b25lX2F3YXJlbmVzc19lbmFibGVkOiB0cnVlCnVzYWdlX3N0YXRzOgogIGluc3RhbGxhdGlvbl9tb2RlOiBoZWxt
diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index ea02fda2e2a..30d94e0425c 100644
--- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml
index 26d3c449161..d987c4cc354 100644
--- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -10,4 +10,4 @@ metadata:
     app.kubernetes.io/managed-by: Helm
   namespace: "citestns"
 data:
-  mimir.yaml: YWN0aXZpdHlfdHJhY2tlcjoKICBmaWxlcGF0aDogL2FjdGl2ZS1xdWVyeS10cmFja2VyL2FjdGl2aXR5LmxvZwphZG1pbl9hcGk6CiAgbGVhZGVyX2VsZWN0aW9uOgogICAgZW5hYmxlZDogdHJ1ZQogICAgcmluZzoKICAgICAga3ZzdG9yZToKICAgICAgICBzdG9yZTogbWVtYmVybGlzdAphZG1pbl9jbGllbnQ6CiAgc3RvcmFnZToKICAgIHMzOgogICAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICAgIGJ1Y2tldF9uYW1lOiBlbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4KICAgICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgICAgaW5zZWN1cmU6IHRydWUKICAgICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgICB0eXBlOiBzMwphbGVydG1hbmFnZXI6CiAgZGF0YV9kaXI6IC9kYXRhCiAgZW5hYmxlX2FwaTogdHJ1ZQogIGV4dGVybmFsX3VybDogL2FsZXJ0bWFuYWdlcgogIGZhbGxiYWNrX2NvbmZpZ19maWxlOiAvY29uZmlncy9hbGVydG1hbmFnZXJfZmFsbGJhY2tfY29uZmlnLnlhbWwKYWxlcnRtYW5hZ2VyX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICBzMzoKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIGJ1Y2tldF9uYW1lOiBtaW1pci1ydWxlcgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKYXV0aDoKICB0eXBlOiBlbnRlcnByaXNlCmJsb2Nrc19zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IG1pbWlyLXRzZGIKICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBpbnNlY3VyZTogdHJ1ZQogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgdHNkYjoKICAgIGRpcjogL2RhdGEvdHNkYgogICAgaGVhZF9jb21wYWN0aW9uX2ludGVydmFsOiAxNW0KICAgIHdhbF9yZXBsYXlfY29uY3VycmVuY3k6IDMKY2x1c3Rlcl9uYW1lOiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzCmNvbXBhY3RvcjoKICBjb21wYWN0aW9uX2ludGVydmFsOiAzMG0KICBkYXRhX2RpcjogL2RhdGEKICBkZWxldGlvbl9kZWxheTogMmgKICBmaXJzdF9sZXZlbF9jb21wYWN0aW9uX3dhaXRfcGVyaW9kOiAyNW0KICBtYXhfY2xvc2luZ19ibG9ja3NfY29uY3VycmVuY3k6IDIKICBtYXhfb3BlbmluZ19ibG9ja3NfY29uY3VycmVuY3k6IDQKICBzaGFyZGluZ19yaW5nOgogICAgaGVhcnRiZWF0X3BlcmlvZDogMW0KICAgIGhlYXJ0YmVhdF90aW1lb3V0OiA0bQogICAgd2FpdF9zdGFiaWxpdHlfbWluX2R1cmF0aW9uOiAxbQogIHN5bWJvbHNfZmx1c2hlcnNfY29uY3VycmVuY3k6IDQKZGlzdHJpYnV0b3I6CiAgcmluZzoKICAgIGhlYXJ0YmVhdF9wZXJpb2Q6IDFtCiAgICBoZWFydGJlYXRfdGltZW91dDogNG0KZnJvbnRlbmQ6CiAgcGFyYWxsZWxpemVfc2hhcmRhYmxlX3F1ZXJpZXM6IHRydWUKICBzY2hlZHVsZXJfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1zY2hlZHVsZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjkwOTUKZnJvbnRlbmRfd29ya2VyOgogIGdycGNfY2xpZW50X2NvbmZpZzoKICAgIG1heF9zZW5kX21zZ19zaXplOiA0MTk0MzA0MDAKICBzY2hlZHVsZXJfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1zY2hlZHVsZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjkwOTUKZ2F0ZXdheToKICBwcm94eToKICAgIGFkbWluX2FwaToKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFsZXJ0bWFuYWdlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hbGVydG1hbmFnZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGNvbXBhY3RvcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1jb21wYWN0b3IuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGRlZmF1bHQ6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItYWRtaW4tYXBpLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkaXN0cmlidXRvcjoKICAgICAgdXJsOiBkbnM6Ly8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1kaXN0cmlidXRvci1oZWFkbGVzcy5jaXRlc3Rucy5zdmMuY2x1c3Rlci5sb2NhbC46OTA5NQogICAgaW5nZXN0ZXI6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItaW5nZXN0ZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIHF1ZXJ5X2Zyb250ZW5kOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLXF1ZXJ5LWZyb250ZW5kLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBydWxlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1ydWxlci5jaXRlc3Rucy5zdmM6ODA4MAogICAgc3RvcmVfZ2F0ZXdheToKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1zdG9yZS1nYXRld2F5LWhlYWRsZXNzLmNpdGVzdG5zLnN2Yzo4MDgwCmluZ2VzdGVyOgogIHJpbmc6CiAgICBmaW5hbF9zbGVlcDogMHMKICAgIGhlYXJ0YmVhdF9wZXJpb2Q6IDJtCiAgICBoZWFydGJlYXRfdGltZW91dDogMTBtCiAgICBudW1fdG9rZW5zOiA1MTIKICAgIHRva2Vuc19maWxlX3BhdGg6IC9kYXRhL3Rva2VucwogICAgdW5yZWdpc3Rlcl9vbl9zaHV0ZG93bjogZmFsc2UKICAgIHpvbmVfYXdhcmVuZXNzX2VuYWJsZWQ6IHRydWUKaW5nZXN0ZXJfY2xpZW50OgogIGdycGNfY2xpZW50X2NvbmZpZzoKICAgIG1heF9yZWN2X21zZ19zaXplOiAxMDQ4NTc2MDAKICAgIG1heF9zZW5kX21zZ19zaXplOiAxMDQ4NTc2MDAKaW5zdHJ1bWVudGF0aW9uOgogIGRpc3RyaWJ1dG9yX2NsaWVudDoKICAgIGFkZHJlc3M6IGRuczovLy90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWRpc3RyaWJ1dG9yLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsLjo5MDk1CiAgZW5hYmxlZDogdHJ1ZQpsaWNlbnNlOgogIHBhdGg6IC9saWNlbnNlL2xpY2Vuc2Uuand0CmxpbWl0czoKICBtYXhfY2FjaGVfZnJlc2huZXNzOiAxMG0KICBtYXhfcXVlcnlfcGFyYWxsZWxpc206IDI0MAogIG1heF90b3RhbF9xdWVyeV9sZW5ndGg6IDEyMDAwaAptZW1iZXJsaXN0OgogIGFib3J0X2lmX2NsdXN0ZXJfam9pbl9mYWlsczogZmFsc2UKICBjb21wcmVzc2lvbl9lbmFibGVkOiBmYWxzZQogIGpvaW5fbWVtYmVyczoKICAtIGRucyt0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWdvc3NpcC1yaW5nLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsLjo3OTQ2CnF1ZXJpZXI6CiAgbWF4X2NvbmN1cnJlbnQ6IDE2CnF1ZXJ5X3NjaGVkdWxlcjoKICBtYXhfb3V0c3RhbmRpbmdfcmVxdWVzdHNfcGVyX3RlbmFudDogODAwCnJ1bGVyOgogIGFsZXJ0bWFuYWdlcl91cmw6IGRuc3Nydm5vYStodHRwOi8vX2h0dHAtbWV0cmljcy5fdGNwLnRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItYWxlcnRtYW5hZ2VyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsLi9hbGVydG1hbmFnZXIKICBlbmFibGVfYXBpOiB0cnVlCiAgcnVsZV9wYXRoOiAvZGF0YQpydWxlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBidWNrZXRfbmFtZTogbWltaXItcnVsZXIKICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBpbnNlY3VyZTogdHJ1ZQogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CnJ1bnRpbWVfY29uZmlnOgogIGZpbGU6IC92YXIvbWltaXIvcnVudGltZS55YW1sCnNlcnZlcjoKICBncnBjX3NlcnZlcl9tYXhfY29ubmVjdGlvbl9pZGxlOiAxbQpzdG9yZV9nYXRld2F5OgogIHNoYXJkaW5nX3Jpbmc6CiAgICBoZWFydGJlYXRfcGVyaW9kOiAxbQogICAgaGVhcnRiZWF0X3RpbWVvdXQ6IDRtCiAgICBrdnN0b3JlOgogICAgICBwcmVmaXg6IG11bHRpLXpvbmUvCiAgICB0b2tlbnNfZmlsZV9wYXRoOiAvZGF0YS90b2tlbnMKICAgIHVucmVnaXN0ZXJfb25fc2h1dGRvd246IGZhbHNlCiAgICB3YWl0X3N0YWJpbGl0eV9taW5fZHVyYXRpb246IDFtCiAgICB6b25lX2F3YXJlbmVzc19lbmFibGVkOiB0cnVlCnVzYWdlX3N0YXRzOgogIGluc3RhbGxhdGlvbl9tb2RlOiBoZWxt
+  mimir.yaml: YWN0aXZpdHlfdHJhY2tlcjoKICBmaWxlcGF0aDogL2FjdGl2ZS1xdWVyeS10cmFja2VyL2FjdGl2aXR5LmxvZwphZG1pbl9hcGk6CiAgbGVhZGVyX2VsZWN0aW9uOgogICAgZW5hYmxlZDogdHJ1ZQogICAgcmluZzoKICAgICAga3ZzdG9yZToKICAgICAgICBzdG9yZTogbWVtYmVybGlzdAphZG1pbl9jbGllbnQ6CiAgc3RvcmFnZToKICAgIHMzOgogICAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICAgIGJ1Y2tldF9uYW1lOiBlbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4KICAgICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgICAgaW5zZWN1cmU6IHRydWUKICAgICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgICB0eXBlOiBzMwphbGVydG1hbmFnZXI6CiAgZGF0YV9kaXI6IC9kYXRhCiAgZW5hYmxlX2FwaTogdHJ1ZQogIGV4dGVybmFsX3VybDogL2FsZXJ0bWFuYWdlcgogIGZhbGxiYWNrX2NvbmZpZ19maWxlOiAvY29uZmlncy9hbGVydG1hbmFnZXJfZmFsbGJhY2tfY29uZmlnLnlhbWwKYWxlcnRtYW5hZ2VyX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICBzMzoKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIGJ1Y2tldF9uYW1lOiBtaW1pci1ydWxlcgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKYXV0aDoKICB0eXBlOiBlbnRlcnByaXNlCmJsb2Nrc19zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IG1pbWlyLXRzZGIKICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBpbnNlY3VyZTogdHJ1ZQogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgdHNkYjoKICAgIGRpcjogL2RhdGEvdHNkYgogICAgaGVhZF9jb21wYWN0aW9uX2ludGVydmFsOiAxNW0KICAgIHdhbF9yZXBsYXlfY29uY3VycmVuY3k6IDMKY2x1c3Rlcl9uYW1lOiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzCmNvbXBhY3RvcjoKICBjb21wYWN0aW9uX2ludGVydmFsOiAzMG0KICBkYXRhX2RpcjogL2RhdGEKICBkZWxldGlvbl9kZWxheTogMmgKICBmaXJzdF9sZXZlbF9jb21wYWN0aW9uX3dhaXRfcGVyaW9kOiAyNW0KICBtYXhfY2xvc2luZ19ibG9ja3NfY29uY3VycmVuY3k6IDIKICBtYXhfb3BlbmluZ19ibG9ja3NfY29uY3VycmVuY3k6IDQKICBzaGFyZGluZ19yaW5nOgogICAgaGVhcnRiZWF0X3BlcmlvZDogMW0KICAgIGhlYXJ0YmVhdF90aW1lb3V0OiA0bQogICAgd2FpdF9zdGFiaWxpdHlfbWluX2R1cmF0aW9uOiAxbQogIHN5bWJvbHNfZmx1c2hlcnNfY29uY3VycmVuY3k6IDQKZGlzdHJpYnV0b3I6CiAgcmluZzoKICAgIGhlYXJ0YmVhdF9wZXJpb2Q6IDFtCiAgICBoZWFydGJlYXRfdGltZW91dDogNG0KZnJvbnRlbmQ6CiAgcGFyYWxsZWxpemVfc2hhcmRhYmxlX3F1ZXJpZXM6IHRydWUKICBzY2hlZHVsZXJfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1zY2hlZHVsZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjkwOTUKZnJvbnRlbmRfd29ya2VyOgogIGdycGNfY2xpZW50X2NvbmZpZzoKICAgIG1heF9zZW5kX21zZ19zaXplOiA0MTk0MzA0MDAKICBzY2hlZHVsZXJfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1zY2hlZHVsZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjkwOTUKZ2F0ZXdheToKICBwcm94eToKICAgIGFkbWluX2FwaToKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFsZXJ0bWFuYWdlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hbGVydG1hbmFnZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGNvbXBhY3RvcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1jb21wYWN0b3IuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGRlZmF1bHQ6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItYWRtaW4tYXBpLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkaXN0cmlidXRvcjoKICAgICAgdXJsOiBkbnM6Ly8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1kaXN0cmlidXRvci1oZWFkbGVzcy5jaXRlc3Rucy5zdmMuY2x1c3Rlci5sb2NhbC46OTA5NQogICAgaW5nZXN0ZXI6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItaW5nZXN0ZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIHF1ZXJ5X2Zyb250ZW5kOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLXF1ZXJ5LWZyb250ZW5kLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBydWxlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1ydWxlci5jaXRlc3Rucy5zdmM6ODA4MAogICAgc3RvcmVfZ2F0ZXdheToKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1zdG9yZS1nYXRld2F5LWhlYWRsZXNzLmNpdGVzdG5zLnN2Yzo4MDgwCmluZ2VzdGVyOgogIHJpbmc6CiAgICBmaW5hbF9zbGVlcDogMHMKICAgIGhlYXJ0YmVhdF9wZXJpb2Q6IDJtCiAgICBoZWFydGJlYXRfdGltZW91dDogMTBtCiAgICBudW1fdG9rZW5zOiA1MTIKICAgIHRva2Vuc19maWxlX3BhdGg6IC9kYXRhL3Rva2VucwogICAgdW5yZWdpc3Rlcl9vbl9zaHV0ZG93bjogZmFsc2UKICAgIHpvbmVfYXdhcmVuZXNzX2VuYWJsZWQ6IHRydWUKaW5nZXN0ZXJfY2xpZW50OgogIGdycGNfY2xpZW50X2NvbmZpZzoKICAgIG1heF9yZWN2X21zZ19zaXplOiAxMDQ4NTc2MDAKICAgIG1heF9zZW5kX21zZ19zaXplOiAxMDQ4NTc2MDAKaW5zdHJ1bWVudGF0aW9uOgogIGRpc3RyaWJ1dG9yX2NsaWVudDoKICAgIGFkZHJlc3M6IGRuczovLy90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWRpc3RyaWJ1dG9yLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsLjo5MDk1CiAgZW5hYmxlZDogdHJ1ZQpsaWNlbnNlOgogIHBhdGg6IC9saWNlbnNlL2xpY2Vuc2Uuand0CmxpbWl0czoKICBtYXhfY2FjaGVfZnJlc2huZXNzOiAxMG0KICBtYXhfcXVlcnlfcGFyYWxsZWxpc206IDI0MAogIG1heF90b3RhbF9xdWVyeV9sZW5ndGg6IDEyMDAwaAptZW1iZXJsaXN0OgogIGFib3J0X2lmX2NsdXN0ZXJfam9pbl9mYWlsczogZmFsc2UKICBjb21wcmVzc2lvbl9lbmFibGVkOiBmYWxzZQogIGpvaW5fbWVtYmVyczoKICAtIGRucyt0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWdvc3NpcC1yaW5nLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsLjo3OTQ2CnF1ZXJpZXI6CiAgbWF4X2NvbmN1cnJlbnQ6IDE2CnF1ZXJ5X3NjaGVkdWxlcjoKICBtYXhfb3V0c3RhbmRpbmdfcmVxdWVzdHNfcGVyX3RlbmFudDogODAwCnJ1bGVyOgogIGFsZXJ0bWFuYWdlcl91cmw6IGRuc3Nydm5vYStodHRwOi8vX2h0dHAtbWV0cmljcy5fdGNwLnRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItYWxlcnRtYW5hZ2VyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsLi9hbGVydG1hbmFnZXIKICBlbmFibGVfYXBpOiB0cnVlCiAgcnVsZV9wYXRoOiAvZGF0YQpydWxlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBidWNrZXRfbmFtZTogbWltaXItcnVsZXIKICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBpbnNlY3VyZTogdHJ1ZQogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CnJ1bnRpbWVfY29uZmlnOgogIGZpbGU6IC92YXIvbWltaXIvcnVudGltZS55YW1sCnN0b3JlX2dhdGV3YXk6CiAgc2hhcmRpbmdfcmluZzoKICAgIGhlYXJ0YmVhdF9wZXJpb2Q6IDFtCiAgICBoZWFydGJlYXRfdGltZW91dDogNG0KICAgIGt2c3RvcmU6CiAgICAgIHByZWZpeDogbXVsdGktem9uZS8KICAgIHRva2Vuc19maWxlX3BhdGg6IC9kYXRhL3Rva2VucwogICAgdW5yZWdpc3Rlcl9vbl9zaHV0ZG93bjogZmFsc2UKICAgIHdhaXRfc3RhYmlsaXR5X21pbl9kdXJhdGlvbjogMW0KICAgIHpvbmVfYXdhcmVuZXNzX2VuYWJsZWQ6IHRydWUKdXNhZ2Vfc3RhdHM6CiAgaW5zdGFsbGF0aW9uX21vZGU6IGhlbG0=
diff --git a/operations/helm/tests/test-ingress-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-ingress-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 4e64a07724e..64e4f6c2af6 100644
--- a/operations/helm/tests/test-ingress-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/test-ingress-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/test-ingress-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-ingress-values-generated/mimir-distributed/templates/mimir-config.yaml
index f31417edbdf..712000dc60a 100644
--- a/operations/helm/tests/test-ingress-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/test-ingress-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -104,8 +104,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index c2144a1c398..f2eb01be352 100644
--- a/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml
index 0ef24e44238..4384daf03af 100644
--- a/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -137,8 +137,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 7c074744e22..c024db40256 100644
--- a/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml
index 616d760983f..6ea11460a81 100644
--- a/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -106,8 +106,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 40833f01628..bf02e032e88 100644
--- a/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml
index 8421d723dc8..f7eef813943 100644
--- a/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -106,8 +106,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 0ab3a2189b0..6f0e137837c 100644
--- a/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/mimir-config.yaml
index 809e68f81ba..01f17f2afee 100644
--- a/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -148,8 +148,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 8281327e829..547a09347e2 100644
--- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -58,6 +58,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/mimir-config.yaml
index 090e4765fa4..8ae0650c741 100644
--- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -136,8 +136,6 @@ data:
         secret_access_key: ${MINIO_ROOT_PASSWORD}
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m
diff --git a/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
index 8c799e4eebb..2fc7975c687 100644
--- a/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
+++ b/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -64,6 +64,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir
diff --git a/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/mimir-config.yaml
index 41f3a1c1099..f22b0de2e80 100644
--- a/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/mimir-config.yaml
+++ b/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -104,8 +104,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m