diff --git a/clusters/cl01tl/helm/s3-exporter/values.yaml b/clusters/cl01tl/helm/s3-exporter/values.yaml
index e12575777..5fe138ab8 100644
--- a/clusters/cl01tl/helm/s3-exporter/values.yaml
+++ b/clusters/cl01tl/helm/s3-exporter/values.yaml
@@ -183,9 +183,10 @@ s3-exporter:
     digital-ocean:
       selector:
         matchLabels:
-          app.kubernetes.io/name: s3-exporter-digital-ocean
-          app.kubernetes.io/instance: s3-exporter-digital-ocean
-      serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
+          app.kubernetes.io/name: s3-exporter
+          app.kubernetes.io/instance: s3-exporter
+          app.kubernetes.io/service: s3-exporter-digital-ocean
+      serviceName: s3-exporter-digital-ocean
       endpoints:
         - port: metrics
           interval: 5m
@@ -194,9 +195,10 @@ s3-exporter:
     ceph-directus:
       selector:
         matchLabels:
-          app.kubernetes.io/name: s3-exporter-ceph-directus
-          app.kubernetes.io/instance: s3-exporter-ceph-directus
-      serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
+          app.kubernetes.io/name: s3-exporter
+          app.kubernetes.io/instance: s3-exporter
+          app.kubernetes.io/service: s3-exporter-ceph-directus
+      serviceName: s3-exporter-ceph-directus
       endpoints:
         - port: metrics
           interval: 5m
@@ -205,9 +207,10 @@ s3-exporter:
     garage-local:
       selector:
         matchLabels:
-          app.kubernetes.io/name: s3-exporter-garage-local
-          app.kubernetes.io/instance: s3-exporter-garage-local
-      serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
+          app.kubernetes.io/name: s3-exporter
+          app.kubernetes.io/instance: s3-exporter
+          app.kubernetes.io/service: s3-exporter-garage-local
+      serviceName: s3-exporter-garage-local
       endpoints:
         - port: metrics
           interval: 5m
@@ -216,9 +219,10 @@ s3-exporter:
     garage-remote:
       selector:
         matchLabels:
-          app.kubernetes.io/name: s3-exporter-garage-remote
-          app.kubernetes.io/instance: s3-exporter-garage-remote
-      serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
+          app.kubernetes.io/name: s3-exporter
+          app.kubernetes.io/instance: s3-exporter
+          app.kubernetes.io/service: s3-exporter-garage-remote
+      serviceName: s3-exporter-garage-remote
       endpoints:
         - port: metrics
           interval: 5m