diff --git a/operations/helm/charts/mimir-distributed/ci/test-enterprise-configmap-values.yaml b/operations/helm/charts/mimir-distributed/ci/test-enterprise-configmap-values.yaml
index b4ccdbce68a..cfe19323974 100644
--- a/operations/helm/charts/mimir-distributed/ci/test-enterprise-configmap-values.yaml
+++ b/operations/helm/charts/mimir-distributed/ci/test-enterprise-configmap-values.yaml
@@ -53,9 +53,6 @@ store_gateway:
   persistentVolume:
     enabled: false
 
-serviceMonitor:
-  enabled: true
-
 # For testing only
 testing:
   minio:
diff --git a/operations/helm/charts/mimir-distributed/ci/test-oss-values.yaml b/operations/helm/charts/mimir-distributed/ci/test-oss-values.yaml
index e090c567464..8e4320d681e 100644
--- a/operations/helm/charts/mimir-distributed/ci/test-oss-values.yaml
+++ b/operations/helm/charts/mimir-distributed/ci/test-oss-values.yaml
@@ -45,9 +45,6 @@ store_gateway:
   persistentVolume:
     enabled: false
 
-serviceMonitor:
-  enabled: true
-
 # For testing only
 testing:
   minio:
diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/admin-api/admin-api-servmon.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/admin-api/admin-api-servmon.yaml
deleted file mode 100644
index ac090e6aca4..00000000000
--- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/admin-api/admin-api-servmon.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Source: mimir-distributed/templates/admin-api/admin-api-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-enterprise-configmap-values-mimir-admin-api
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-enterprise-configmap-values
-    app.kubernetes.io/component: admin-api
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-enterprise-configmap-values
-      app.kubernetes.io/component: admin-api
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/admin-api"
-          targetLabel: job
-        - replacement: "test-enterprise-configmap-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/alertmanager/alertmanager-servmon.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/alertmanager/alertmanager-servmon.yaml
deleted file mode 100644
index 0303d687e1d..00000000000
--- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/alertmanager/alertmanager-servmon.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-# Source: mimir-distributed/templates/alertmanager/alertmanager-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-enterprise-configmap-values-mimir-alertmanager
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-enterprise-configmap-values
-    app.kubernetes.io/component: alertmanager
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-enterprise-configmap-values
-      app.kubernetes.io/component: alertmanager
-    matchExpressions:
-      - key: prometheus.io/service-monitor
-        operator: NotIn
-        values:
-          - "false"
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/alertmanager"
-          targetLabel: job
-        - replacement: "test-enterprise-configmap-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/compactor/compactor-servmon.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/compactor/compactor-servmon.yaml
deleted file mode 100644
index 4f104d5821e..00000000000
--- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/compactor/compactor-servmon.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Source: mimir-distributed/templates/compactor/compactor-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-enterprise-configmap-values-mimir-compactor
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-enterprise-configmap-values
-    app.kubernetes.io/component: compactor
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-enterprise-configmap-values
-      app.kubernetes.io/component: compactor
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/compactor"
-          targetLabel: job
-        - replacement: "test-enterprise-configmap-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/distributor/distributor-servmon.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/distributor/distributor-servmon.yaml
deleted file mode 100644
index d3810e10d85..00000000000
--- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/distributor/distributor-servmon.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Source: mimir-distributed/templates/distributor/distributor-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-enterprise-configmap-values-mimir-distributor
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-enterprise-configmap-values
-    app.kubernetes.io/component: distributor
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-enterprise-configmap-values
-      app.kubernetes.io/component: distributor
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/distributor"
-          targetLabel: job
-        - replacement: "test-enterprise-configmap-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/gateway/gateway-servmon.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/gateway/gateway-servmon.yaml
deleted file mode 100644
index a168b6ab6c9..00000000000
--- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/gateway/gateway-servmon.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# Source: mimir-distributed/templates/gateway/gateway-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-enterprise-configmap-values-mimir-gateway
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-enterprise-configmap-values
-    app.kubernetes.io/component: gateway
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-enterprise-configmap-values
-      app.kubernetes.io/component: gateway
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/gateway"
-          targetLabel: job
-        - replacement: "test-enterprise-configmap-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/ingester/ingester-servmon.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/ingester/ingester-servmon.yaml
deleted file mode 100644
index 434daf7bdba..00000000000
--- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/ingester/ingester-servmon.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-# Source: mimir-distributed/templates/ingester/ingester-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-enterprise-configmap-values-mimir-ingester
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-enterprise-configmap-values
-    app.kubernetes.io/component: ingester
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-enterprise-configmap-values
-      app.kubernetes.io/component: ingester
-    matchExpressions:
-      - key: prometheus.io/service-monitor
-        operator: NotIn
-        values:
-          - "false"
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/ingester"
-          targetLabel: job
-        - replacement: "test-enterprise-configmap-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/querier/querier-servmon.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/querier/querier-servmon.yaml
deleted file mode 100644
index a545de9b0db..00000000000
--- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/querier/querier-servmon.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Source: mimir-distributed/templates/querier/querier-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-enterprise-configmap-values-mimir-querier
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-enterprise-configmap-values
-    app.kubernetes.io/component: querier
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-enterprise-configmap-values
-      app.kubernetes.io/component: querier
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/querier"
-          targetLabel: job
-        - replacement: "test-enterprise-configmap-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/query-frontend/query-frontend-servmon.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/query-frontend/query-frontend-servmon.yaml
deleted file mode 100644
index 143535a9ef0..00000000000
--- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/query-frontend/query-frontend-servmon.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-# Source: mimir-distributed/templates/query-frontend/query-frontend-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-enterprise-configmap-values-mimir-query-frontend
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-enterprise-configmap-values
-    app.kubernetes.io/component: query-frontend
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-enterprise-configmap-values
-      app.kubernetes.io/component: query-frontend
-    matchExpressions:
-      - key: prometheus.io/service-monitor
-        operator: NotIn
-        values:
-          - "false"
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/query-frontend"
-          targetLabel: job
-        - replacement: "test-enterprise-configmap-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/ruler/ruler-servmon.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/ruler/ruler-servmon.yaml
deleted file mode 100644
index 5ce457d731b..00000000000
--- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/ruler/ruler-servmon.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Source: mimir-distributed/templates/ruler/ruler-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-enterprise-configmap-values-mimir-ruler
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-enterprise-configmap-values
-    app.kubernetes.io/component: ruler
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-enterprise-configmap-values
-      app.kubernetes.io/component: ruler
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/ruler"
-          targetLabel: job
-        - replacement: "test-enterprise-configmap-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/store-gateway/store-gateway-servmon.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/store-gateway/store-gateway-servmon.yaml
deleted file mode 100644
index cf276f2ba85..00000000000
--- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/store-gateway/store-gateway-servmon.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-# Source: mimir-distributed/templates/store-gateway/store-gateway-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-enterprise-configmap-values-mimir-store-gateway
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-enterprise-configmap-values
-    app.kubernetes.io/component: store-gateway
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-enterprise-configmap-values
-      app.kubernetes.io/component: store-gateway
-    matchExpressions:
-      - key: prometheus.io/service-monitor
-        operator: NotIn
-        values:
-          - "false"
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/store-gateway"
-          targetLabel: job
-        - replacement: "test-enterprise-configmap-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-servmon.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-servmon.yaml
deleted file mode 100644
index 82692b388d7..00000000000
--- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-servmon.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-# Source: mimir-distributed/templates/alertmanager/alertmanager-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-oss-values-mimir-alertmanager
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-oss-values
-    app.kubernetes.io/component: alertmanager
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-oss-values
-      app.kubernetes.io/component: alertmanager
-    matchExpressions:
-      - key: prometheus.io/service-monitor
-        operator: NotIn
-        values:
-          - "false"
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/alertmanager"
-          targetLabel: job
-        - replacement: "test-oss-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-servmon.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-servmon.yaml
deleted file mode 100644
index 6aa9c8053db..00000000000
--- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-servmon.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Source: mimir-distributed/templates/compactor/compactor-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-oss-values-mimir-compactor
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-oss-values
-    app.kubernetes.io/component: compactor
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-oss-values
-      app.kubernetes.io/component: compactor
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/compactor"
-          targetLabel: job
-        - replacement: "test-oss-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-servmon.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-servmon.yaml
deleted file mode 100644
index 9fe6786aad7..00000000000
--- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-servmon.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Source: mimir-distributed/templates/distributor/distributor-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-oss-values-mimir-distributor
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-oss-values
-    app.kubernetes.io/component: distributor
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-oss-values
-      app.kubernetes.io/component: distributor
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/distributor"
-          targetLabel: job
-        - replacement: "test-oss-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-servmon.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-servmon.yaml
deleted file mode 100644
index e942528140b..00000000000
--- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-servmon.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-# Source: mimir-distributed/templates/ingester/ingester-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-oss-values-mimir-ingester
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-oss-values
-    app.kubernetes.io/component: ingester
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-oss-values
-      app.kubernetes.io/component: ingester
-    matchExpressions:
-      - key: prometheus.io/service-monitor
-        operator: NotIn
-        values:
-          - "false"
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/ingester"
-          targetLabel: job
-        - replacement: "test-oss-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-servmon.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-servmon.yaml
deleted file mode 100644
index e5ad9cbb092..00000000000
--- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-servmon.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Source: mimir-distributed/templates/querier/querier-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-oss-values-mimir-querier
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-oss-values
-    app.kubernetes.io/component: querier
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-oss-values
-      app.kubernetes.io/component: querier
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/querier"
-          targetLabel: job
-        - replacement: "test-oss-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-servmon.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-servmon.yaml
deleted file mode 100644
index affc3f701c0..00000000000
--- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-servmon.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-# Source: mimir-distributed/templates/query-frontend/query-frontend-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-oss-values-mimir-query-frontend
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-oss-values
-    app.kubernetes.io/component: query-frontend
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-oss-values
-      app.kubernetes.io/component: query-frontend
-    matchExpressions:
-      - key: prometheus.io/service-monitor
-        operator: NotIn
-        values:
-          - "false"
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/query-frontend"
-          targetLabel: job
-        - replacement: "test-oss-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-servmon.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-servmon.yaml
deleted file mode 100644
index 67f9048cefe..00000000000
--- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-servmon.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Source: mimir-distributed/templates/ruler/ruler-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-oss-values-mimir-ruler
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-oss-values
-    app.kubernetes.io/component: ruler
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-oss-values
-      app.kubernetes.io/component: ruler
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/ruler"
-          targetLabel: job
-        - replacement: "test-oss-values"
-          targetLabel: cluster
-      scheme: http
diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-servmon.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-servmon.yaml
deleted file mode 100644
index 390ccdcae3f..00000000000
--- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-servmon.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-# Source: mimir-distributed/templates/store-gateway/store-gateway-servmon.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-oss-values-mimir-store-gateway
-  namespace: citestns
-  labels:
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/instance: test-oss-values
-    app.kubernetes.io/component: store-gateway
-    app.kubernetes.io/part-of: memberlist
-    app.kubernetes.io/version: "2.1.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  namespaceSelector:
-    matchNames:
-    - citestns
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: mimir
-      app.kubernetes.io/instance: test-oss-values
-      app.kubernetes.io/component: store-gateway
-    matchExpressions:
-      - key: prometheus.io/service-monitor
-        operator: NotIn
-        values:
-          - "false"
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - sourceLabels: [job]
-          replacement: "citestns/store-gateway"
-          targetLabel: job
-        - replacement: "test-oss-values"
-          targetLabel: cluster
-      scheme: http