diff --git a/class/mimir.yml b/class/mimir.yml
index f8055655..0250953f 100644
--- a/class/mimir.yml
+++ b/class/mimir.yml
@@ -18,6 +18,14 @@ parameters:
         output_path: ${_instance}/
 
       # Helm chart
+      - input_type: external
+        input_paths:
+          - ${_base_directory}/run-command
+        args:
+          - rm
+          - -f
+          - ${_base_directory}/helmcharts/mimir-distributed/${mimir:charts:mimir-distributed:version}/templates/gateway/gateway-servmon.yaml
+        output_path: .
       - input_type: jsonnet
         input_paths:
           - ${_base_directory}/component/helm_presets.jsonnet
diff --git a/run-patch b/run-command
similarity index 69%
rename from run-patch
rename to run-command
index 8ff26224..1401ab6f 100755
--- a/run-patch
+++ b/run-command
@@ -8,6 +8,9 @@ set -e
 # Kapitan provides a fairly standard PATH variable, we add /opt/homebrew/bin for macOS
 export PATH="${PATH}:/opt/homebrew/bin"
 
-patch=$(which patch) || (>&2 echo "patch not found in ${PATH}"; exit 7)
+cmdname="${1}"
+shift
 
-exec "$patch" "${@}"
+cmd=$(which "${cmdname}") || (>&2 echo "${cmdname} not found in ${PATH}"; exit 7)
+
+exec "$cmd" "${@}"
diff --git a/tests/golden/defaults/defaults/defaults/10_mimir_distributed/mimir-distributed/templates/gateway/gateway-servmon.yaml b/tests/golden/defaults/defaults/defaults/10_mimir_distributed/mimir-distributed/templates/gateway/gateway-servmon.yaml
deleted file mode 100644
index ef0afb01..00000000
--- a/tests/golden/defaults/defaults/defaults/10_mimir_distributed/mimir-distributed/templates/gateway/gateway-servmon.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app.kubernetes.io/component: gateway
-    app.kubernetes.io/instance: defaults
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/version: 3.0.4
-    helm.sh/chart: mimir-distributed-6.0.6
-  name: defaults-mimir-gateway
-  namespace: defaults
-spec:
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - action: replace
-          replacement: defaults/gateway
-          sourceLabels:
-            - job
-          targetLabel: job
-        - action: replace
-          replacement: defaults
-          targetLabel: cluster
-      scheme: http
-  namespaceSelector:
-    matchNames:
-      - defaults
-  selector:
-    matchExpressions:
-      - key: prometheus.io/service-monitor
-        operator: NotIn
-        values:
-          - 'false'
-    matchLabels:
-      app.kubernetes.io/component: gateway
-      app.kubernetes.io/instance: defaults
-      app.kubernetes.io/name: mimir
diff --git a/tests/golden/legacy/legacy/legacy/10_mimir_distributed/mimir-distributed/templates/gateway/gateway-servmon.yaml b/tests/golden/legacy/legacy/legacy/10_mimir_distributed/mimir-distributed/templates/gateway/gateway-servmon.yaml
deleted file mode 100644
index 42ccc076..00000000
--- a/tests/golden/legacy/legacy/legacy/10_mimir_distributed/mimir-distributed/templates/gateway/gateway-servmon.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app.kubernetes.io/component: gateway
-    app.kubernetes.io/instance: legacy
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/version: 3.0.4
-    helm.sh/chart: mimir-distributed-6.0.6
-  name: legacy-mimir-gateway
-  namespace: legacy
-spec:
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - action: replace
-          replacement: legacy/gateway
-          sourceLabels:
-            - job
-          targetLabel: job
-        - action: replace
-          replacement: legacy
-          targetLabel: cluster
-      scheme: http
-  namespaceSelector:
-    matchNames:
-      - legacy
-  selector:
-    matchExpressions:
-      - key: prometheus.io/service-monitor
-        operator: NotIn
-        values:
-          - 'false'
-    matchLabels:
-      app.kubernetes.io/component: gateway
-      app.kubernetes.io/instance: legacy
-      app.kubernetes.io/name: mimir
diff --git a/tests/golden/preset-large/preset-large/preset-large/10_mimir_distributed/mimir-distributed/templates/gateway/gateway-servmon.yaml b/tests/golden/preset-large/preset-large/preset-large/10_mimir_distributed/mimir-distributed/templates/gateway/gateway-servmon.yaml
deleted file mode 100644
index a3d8f55f..00000000
--- a/tests/golden/preset-large/preset-large/preset-large/10_mimir_distributed/mimir-distributed/templates/gateway/gateway-servmon.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app.kubernetes.io/component: gateway
-    app.kubernetes.io/instance: preset-large
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/version: 3.0.4
-    helm.sh/chart: mimir-distributed-6.0.6
-  name: preset-large-mimir-gateway
-  namespace: preset-large
-spec:
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - action: replace
-          replacement: preset-large/gateway
-          sourceLabels:
-            - job
-          targetLabel: job
-        - action: replace
-          replacement: preset-large
-          targetLabel: cluster
-      scheme: http
-  namespaceSelector:
-    matchNames:
-      - preset-large
-  selector:
-    matchExpressions:
-      - key: prometheus.io/service-monitor
-        operator: NotIn
-        values:
-          - 'false'
-    matchLabels:
-      app.kubernetes.io/component: gateway
-      app.kubernetes.io/instance: preset-large
-      app.kubernetes.io/name: mimir
diff --git a/tests/golden/preset-small/preset-small/preset-small/10_mimir_distributed/mimir-distributed/templates/gateway/gateway-servmon.yaml b/tests/golden/preset-small/preset-small/preset-small/10_mimir_distributed/mimir-distributed/templates/gateway/gateway-servmon.yaml
deleted file mode 100644
index 334cb451..00000000
--- a/tests/golden/preset-small/preset-small/preset-small/10_mimir_distributed/mimir-distributed/templates/gateway/gateway-servmon.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app.kubernetes.io/component: gateway
-    app.kubernetes.io/instance: preset-small
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: mimir
-    app.kubernetes.io/version: 3.0.4
-    helm.sh/chart: mimir-distributed-6.0.6
-  name: preset-small-mimir-gateway
-  namespace: preset-small
-spec:
-  endpoints:
-    - port: http-metrics
-      relabelings:
-        - action: replace
-          replacement: preset-small/gateway
-          sourceLabels:
-            - job
-          targetLabel: job
-        - action: replace
-          replacement: preset-small
-          targetLabel: cluster
-      scheme: http
-  namespaceSelector:
-    matchNames:
-      - preset-small
-  selector:
-    matchExpressions:
-      - key: prometheus.io/service-monitor
-        operator: NotIn
-        values:
-          - 'false'
-    matchLabels:
-      app.kubernetes.io/component: gateway
-      app.kubernetes.io/instance: preset-small
-      app.kubernetes.io/name: mimir