diff --git a/monitoring/prometheus-statsd-exporter.yml b/monitoring/prometheus-statsd-exporter.yml
index a354a38..4681d72 100644
--- a/monitoring/prometheus-statsd-exporter.yml
+++ b/monitoring/prometheus-statsd-exporter.yml
@@ -1,117 +1,119 @@
 # -------
 # Prometheus statsd exporter configuration
 # -------
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: prometheus-statsd-exporter
 data:
   config.yml: |
     defaults:
       timer_type: histogram
       buckets:
         - .005
         - .01
         - .025
         - .05
         - .1
         - .25
         - .5
         - .75
         - 1
         - 2
         - 5
         - 10
         - 15
         - 30
         - 45
         - 60
         - 120
         - 300
         - 600
         - 900
         - 1800
         - 2700
         - 3600
         - 7200
     mappings:
       - match: "(.*_percent)"
         name: "${1}"
         match_type: regex
         observer_type: histogram
         histogram_options:
           buckets:
             - 0.0
             - 0.05
             - 0.1
             - 0.15
             - 0.2
             - 0.25
             - 0.3
             - 0.35
             - 0.4
             - 0.45
             - 0.5
             - 0.55
             - 0.6
             - 0.65
             - 0.7
             - 0.75
             - 0.8
             - 0.85
             - 0.9
             - 0.95
             - 1.
 
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: prometheus-statsd-exporter
   labels:
     app: prometheus-statsd-exporter
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: prometheus-statsd-exporter
   template:
     metadata:
       labels:
         app: prometheus-statsd-exporter
     spec:
       containers:
       - name: prometheus-statsd-exporter
         image: prom/statsd-exporter
         imagePullPolicy: Always
         args:
           - "--statsd.mapping-config=/etc/prometheus/statsd-mapping.yml"
         ports:
         - containerPort: 9125
         volumeMounts:
           - name: config
             mountPath: /etc/prometheus/statsd-mapping.yml
             subPath: config.yml
             readOnly: true
       volumes:
         - name: config
           configMap:
             name: prometheus-statsd-exporter
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: prometheus-statsd-exporter
+  name: prometheus-statsd-exporter-svc
+  labels:
+    app: prometheus-statsd-exporter
 spec:
   type: ClusterIP
   selector:
     app: prometheus-statsd-exporter
   ports:
     - name: statsd
       port: 9125
       targetPort: 9125
       protocol: UDP
     - name: http
       port: 9102
       targetPort: 9102
diff --git a/monitoring/swh-statsd-metrics-sm.yml b/monitoring/swh-statsd-metrics-sm.yml
new file mode 100644
index 0000000..d4011f6
--- /dev/null
+++ b/monitoring/swh-statsd-metrics-sm.yml
@@ -0,0 +1,19 @@
+# The following matches the monitor currently installed in the cluster
+# kubectl -n cattle-monitoring-system get servicemonitors.monitoring.coreos.com -o yaml
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: swh-statsd-metrics-sm
+  # namespace: cattle-monitoring-system
+spec:
+  endpoints:
+  - path: /metrics
+    port: http
+    interval: 10s
+  selector:
+    matchLabels:
+      app: prometheus-statsd-exporter
+  namespaceSelector:
+    matchNames:
+    - default