diff --git a/build/helm/keylime-controller/templates/metrics-service.yaml b/build/helm/keylime-controller/templates/metrics-service.yaml
index 1bf70c0..299b832 100644
--- a/build/helm/keylime-controller/templates/metrics-service.yaml
+++ b/build/helm/keylime-controller/templates/metrics-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "keylime-controller.fullname" . }}-controller-manager-metrics-service
+  name: {{ include "keylime-controller.fullname" . }}-metrics-service
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
     app.kubernetes.io/created-by: attestation-operator
diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml
index f5bc910..118efaa 100644
--- a/config/rbac/auth_proxy_service.yaml
+++ b/config/rbac/auth_proxy_service.yaml
@@ -4,12 +4,12 @@ metadata:
   labels:
     control-plane: controller-manager
     app.kubernetes.io/name: service
-    app.kubernetes.io/instance: controller-manager-metrics-service
+    app.kubernetes.io/instance: metrics-service
     app.kubernetes.io/component: kube-rbac-proxy
     app.kubernetes.io/created-by: attestation-operator
     app.kubernetes.io/part-of: attestation-operator
     app.kubernetes.io/managed-by: kustomize
-  name: controller-manager-metrics-service
+  name: metrics-service
   namespace: system
 spec:
   ports: