diff --git a/helm-charts/seldon-core-operator/templates/service.yaml b/helm-charts/seldon-core-operator/templates/service.yaml
index f4d3b2d11f..a86abe2c47 100644
--- a/helm-charts/seldon-core-operator/templates/service.yaml
+++ b/helm-charts/seldon-core-operator/templates/service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: seldon-controller-manager
     controller-tools.k8s.io: "1.0"
     app.kubernetes.io/name: {{ include "seldon.name" . }}
     helm.sh/chart: {{ include "seldon.chart" . }}
@@ -14,5 +14,5 @@ spec:
   ports:
     - port: 443
   selector:
-    control-plane: controller-manager
-    controller-tools.k8s.io: "1.0"
\ No newline at end of file
+    control-plane: seldon-controller-manager
+    controller-tools.k8s.io: "1.0"
diff --git a/helm-charts/seldon-core-operator/templates/statefulset.yaml b/helm-charts/seldon-core-operator/templates/statefulset.yaml
index 42a729005b..ea3f047a3c 100644
--- a/helm-charts/seldon-core-operator/templates/statefulset.yaml
+++ b/helm-charts/seldon-core-operator/templates/statefulset.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: seldon-controller-manager
     controller-tools.k8s.io: "1.0"
     app.kubernetes.io/name: {{ include "seldon.name" . }}
     helm.sh/chart: {{ include "seldon.chart" . }}
@@ -13,7 +13,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: seldon-controller-manager
       controller-tools.k8s.io: "1.0"
       app.kubernetes.io/name: {{ include "seldon.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
@@ -23,7 +23,7 @@ spec:
       annotations:
         prometheus.io/scrape: "true"
       labels:
-        control-plane: controller-manager
+        control-plane: seldon-controller-manager
         controller-tools.k8s.io: "1.0"
         app.kubernetes.io/name: {{ include "seldon.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
@@ -92,4 +92,4 @@ spec:
         - name: cert
           secret:
             defaultMode: 420
-            secretName: seldon-operator-webhook-server-secret
\ No newline at end of file
+            secretName: seldon-operator-webhook-server-secret