diff -c -r step2/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml step3/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
*** step2/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
--- step3/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
***************
*** 3,125 ****
  apiVersion: apps/v1
  kind: StatefulSet
  metadata:
-   name: krajo-mimir-store-gateway
-   labels:
-     app.kubernetes.io/name: mimir
-     app.kubernetes.io/instance: krajo
-     app.kubernetes.io/component: store-gateway
-     app.kubernetes.io/part-of: memberlist
-     app.kubernetes.io/managed-by: Helm
-   annotations:
-     {}
-   namespace: "default"
- spec:
-   replicas: 1
-   selector:
-     matchLabels:
-       app.kubernetes.io/name: mimir
-       app.kubernetes.io/instance: krajo
-       app.kubernetes.io/component: store-gateway
-   updateStrategy:
-     type: RollingUpdate
-   serviceName: krajo-mimir-store-gateway-headless
-   volumeClaimTemplates:
-     - metadata:
-         name: storage
-       spec:
-         accessModes:
-           - ReadWriteOnce
-         resources:
-           requests:
-             storage: "2Gi"
-   template:
-     metadata:
-       labels:
-         app.kubernetes.io/name: mimir
-         app.kubernetes.io/instance: krajo
-         app.kubernetes.io/managed-by: Helm
-         app.kubernetes.io/component: store-gateway
-         app.kubernetes.io/part-of: memberlist
-       annotations:
-       namespace: "default"
-     spec:
-       serviceAccountName: krajo-mimir
-       securityContext:
-         {}
-       initContainers:
-         []
-       nodeSelector:
-         {}
-       affinity:
-         {}
-       topologySpreadConstraints:
-         - maxSkew: 1
-           topologyKey: kubernetes.io/hostname
-           whenUnsatisfiable: ScheduleAnyway
-           labelSelector:
-             matchLabels:
-               app.kubernetes.io/name: mimir
-               app.kubernetes.io/instance: krajo
-               app.kubernetes.io/component: store-gateway
-       tolerations:
-         []
-       terminationGracePeriodSeconds: 240
-       volumes:
-         - name: config
-           configMap:
-             name: krajo-mimir-config
-             items:
-               - key: "mimir.yaml"
-                 path: "mimir.yaml"
-         - name: runtime-config
-           configMap:
-             name: krajo-mimir-runtime
-       containers:
-         - name: store-gateway
-           imagePullPolicy: IfNotPresent
-           args:
-             - "-target=store-gateway"
-             - "-config.expand-env=true"
-             - "-config.file=/etc/mimir/mimir.yaml"
-             - "-store-gateway.sharding-ring.prefix=collectors/"
-             - "-store-gateway.sharding-ring.zone-awareness-enabled=false"
-           volumeMounts:
-             - name: config
-               mountPath: /etc/mimir
-             - name: runtime-config
-               mountPath: /var/mimir
-             - name: storage
-               mountPath: "/data"
-           ports:
-             - name: http-metrics
-               containerPort: 8080
-               protocol: TCP
-             - name: grpc
-               containerPort: 9095
-               protocol: TCP
-             - name: memberlist
-               containerPort: 7946
-               protocol: TCP
-           livenessProbe:
-             null
-           readinessProbe:
-             httpGet:
-               path: /ready
-               port: http-metrics
-             initialDelaySeconds: 60
-           resources:
-             requests:
-               cpu: 100m
-               memory: 512Mi
-           securityContext:
-             readOnlyRootFilesystem: true
-           env:
-           envFrom:
- ---
- # Source: mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
- apiVersion: apps/v1
- kind: StatefulSet
- metadata:
    name: krajo-mimir-store-gateway-zone-a
    labels:
      app.kubernetes.io/name: mimir
--- 3,8 ----
diff -c -r step2/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml step3/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml
*** step2/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml
--- step3/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml
***************
*** 3,38 ****
  apiVersion: v1
  kind: Service
  metadata:
-   name: krajo-mimir-store-gateway
-   labels:
-     app.kubernetes.io/name: mimir
-     app.kubernetes.io/instance: krajo
-     app.kubernetes.io/component: store-gateway
-     app.kubernetes.io/part-of: memberlist
-     app.kubernetes.io/managed-by: Helm
-   annotations:
-     {}
-   namespace: "default"
- spec:
-   type: ClusterIP
-   ports:
-     - port: 8080
-       protocol: TCP
-       name: http-metrics
-       targetPort: http-metrics
-     - port: 9095
-       protocol: TCP
-       name: grpc
-       targetPort: grpc
-   selector:
-     app.kubernetes.io/name: mimir
-     app.kubernetes.io/instance: krajo
-     app.kubernetes.io/component: store-gateway
- ---
- # Source: mimir-distributed/templates/store-gateway/store-gateway-svc.yaml
- apiVersion: v1
- kind: Service
- metadata:
    name: krajo-mimir-store-gateway-zone-a
    labels:
      app.kubernetes.io/name: mimir
--- 3,8 ----
***************
*** 43,50 ****
      name: "store-gateway-zone-a"
      rollout-group: store-gateway
      zone: zone-a
-     # Prevent scraping PODs via this service during migration as the original non zone-aware service already scrapes all PODs and you get duplicate metrics.
-     prometheus.io/service-monitor: "false"
    annotations:
      {}
    namespace: "default"
--- 13,18 ----
***************
*** 80,87 ****
      name: "store-gateway-zone-b"
      rollout-group: store-gateway
      zone: zone-b
-     # Prevent scraping PODs via this service during migration as the original non zone-aware service already scrapes all PODs and you get duplicate metrics.
-     prometheus.io/service-monitor: "false"
    annotations:
      {}
    namespace: "default"
--- 48,53 ----
***************
*** 117,124 ****
      name: "store-gateway-zone-c"
      rollout-group: store-gateway
      zone: zone-c
-     # Prevent scraping PODs via this service during migration as the original non zone-aware service already scrapes all PODs and you get duplicate metrics.
-     prometheus.io/service-monitor: "false"
    annotations:
      {}
    namespace: "default"
--- 83,88 ----
