diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 0a9e6ff2..9a9a228a 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -3,6 +3,7 @@ kind: Namespace
 metadata:
   labels:
     control-plane: controller-manager
+    openstack.org/operator-name: test-operator
     app.kubernetes.io/name: namespace
     app.kubernetes.io/instance: system
     app.kubernetes.io/component: manager
@@ -18,6 +19,7 @@ metadata:
   namespace: system
   labels:
     control-plane: controller-manager
+    openstack.org/operator-name: test-operator
     app.kubernetes.io/name: deployment
     app.kubernetes.io/instance: controller-manager
     app.kubernetes.io/component: manager
@@ -27,7 +29,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      openstack.org/operator-name: test-operator
   replicas: 1
   template:
     metadata:
diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml
index caf880f2..a3381872 100644
--- a/config/prometheus/monitor.yaml
+++ b/config/prometheus/monitor.yaml
@@ -23,4 +23,4 @@ spec:
         insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      openstack.org/operator-name: test-operator
diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml
index 5a404994..6e9469ae 100644
--- a/config/rbac/auth_proxy_service.yaml
+++ b/config/rbac/auth_proxy_service.yaml
@@ -18,4 +18,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    control-plane: controller-manager
+    openstack.org/operator-name: test-operator
diff --git a/config/webhook/service.yaml b/config/webhook/service.yaml
index d7fa7e08..bf959d74 100644
--- a/config/webhook/service.yaml
+++ b/config/webhook/service.yaml
@@ -17,4 +17,4 @@ spec:
       protocol: TCP
       targetPort: 9443
   selector:
-    control-plane: controller-manager
+    openstack.org/operator-name: test-operator