diff --git a/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml b/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml
index ac1ae15e029..974b3bdbb27 100644
--- a/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml
+++ b/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml
@@ -4,6 +4,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
+  labels:
+    app.kubernetes.io/name: opendatahub-operator
+    app.kubernetes.io/part-of: opendatahub
   name: datascienceclusters.datasciencecluster.opendatahub.io
 spec:
   group: datasciencecluster.opendatahub.io
diff --git a/bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml b/bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml
index e7ecd8d551b..a508467793e 100644
--- a/bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml
+++ b/bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml
@@ -4,6 +4,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
+  labels:
+    app.kubernetes.io/name: opendatahub-operator
+    app.kubernetes.io/part-of: opendatahub
   name: dscinitializations.dscinitialization.opendatahub.io
 spec:
   group: dscinitialization.opendatahub.io
diff --git a/bundle/manifests/features.opendatahub.io_featuretrackers.yaml b/bundle/manifests/features.opendatahub.io_featuretrackers.yaml
index 7ffc31f992b..e4f01cd83cb 100644
--- a/bundle/manifests/features.opendatahub.io_featuretrackers.yaml
+++ b/bundle/manifests/features.opendatahub.io_featuretrackers.yaml
@@ -4,6 +4,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
+  labels:
+    app.kubernetes.io/name: opendatahub-operator
+    app.kubernetes.io/part-of: opendatahub
   name: featuretrackers.features.opendatahub.io
 spec:
   group: features.opendatahub.io
diff --git a/bundle/manifests/opendatahub-operator-controller-manager-metrics-service_v1_service.yaml b/bundle/manifests/opendatahub-operator-controller-manager-metrics-service_v1_service.yaml
index c234bf4b695..d4dae6b756a 100644
--- a/bundle/manifests/opendatahub-operator-controller-manager-metrics-service_v1_service.yaml
+++ b/bundle/manifests/opendatahub-operator-controller-manager-metrics-service_v1_service.yaml
@@ -3,7 +3,9 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
-    control-plane: controller-manager
+    app.kubernetes.io/name: opendatahub-operator
+    app.kubernetes.io/part-of: opendatahub
+    control-plane: opendatahub-operator
   name: opendatahub-operator-controller-manager-metrics-service
 spec:
   ports:
@@ -12,6 +14,8 @@ spec:
     protocol: TCP
     targetPort: 8080
   selector:
-    control-plane: controller-manager
+    app.kubernetes.io/name: opendatahub-operator
+    app.kubernetes.io/part-of: opendatahub
+    control-plane: opendatahub-operator
 status:
   loadBalancer: {}
diff --git a/bundle/manifests/opendatahub-operator-manager-config_v1_configmap.yaml b/bundle/manifests/opendatahub-operator-manager-config_v1_configmap.yaml
index 99bb8b739f3..7daf758fc56 100644
--- a/bundle/manifests/opendatahub-operator-manager-config_v1_configmap.yaml
+++ b/bundle/manifests/opendatahub-operator-manager-config_v1_configmap.yaml
@@ -11,4 +11,7 @@ data:
       port: 9443
 kind: ConfigMap
 metadata:
+  labels:
+    app.kubernetes.io/name: opendatahub-operator
+    app.kubernetes.io/part-of: opendatahub
   name: opendatahub-operator-manager-config
diff --git a/bundle/manifests/opendatahub-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/opendatahub-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
index 52b3319cbcd..57ec7ee1a52 100644
--- a/bundle/manifests/opendatahub-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
+++ b/bundle/manifests/opendatahub-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
@@ -2,6 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
+  labels:
+    app.kubernetes.io/name: opendatahub-operator
+    app.kubernetes.io/part-of: opendatahub
   name: opendatahub-operator-metrics-reader
 rules:
 - nonResourceURLs:
diff --git a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml
index 8bdb789af70..a6ecf155ad2 100644
--- a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml
@@ -1654,21 +1654,26 @@ spec:
         serviceAccountName: opendatahub-operator-controller-manager
       deployments:
       - label:
-          control-plane: controller-manager
-        name: opendatahub-operator-controller-manager
+          app.kubernetes.io/name: opendatahub-operator
+          app.kubernetes.io/part-of: opendatahub
+          control-plane: opendatahub-operator
+        name: opendatahub-operator-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
-              control-plane: controller-manager
+              app.kubernetes.io/name: opendatahub-operator
+              app.kubernetes.io/part-of: opendatahub
+              control-plane: opendatahub-operator
           strategy: {}
           template:
             metadata:
               annotations:
                 kubectl.kubernetes.io/default-container: manager
               labels:
-                control-plane: controller-manager
-                name: opendatahub-operator
+                app.kubernetes.io/name: opendatahub-operator
+                app.kubernetes.io/part-of: opendatahub
+                control-plane: opendatahub-operator
             spec:
               containers:
               - args:
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 7c2b111419f..e64632e3546 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -12,8 +12,9 @@ namespace: opendatahub-operator-system
 namePrefix: opendatahub-operator-
 
 # Labels to add to all resources and selectors.
-#labels:
-#  someName: someValue
+commonLabels:
+  app.kubernetes.io/name: opendatahub-operator
+  app.kubernetes.io/part-of: opendatahub
 
 resources:
 - ../crd
diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
index 287adcc0029..af6f86c8ee3 100644
--- a/config/default/manager_auth_proxy_patch.yaml
+++ b/config/default/manager_auth_proxy_patch.yaml
@@ -3,7 +3,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: manager
   namespace: system
 spec:
   template:
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 7706cd69231..1153239cfde 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -8,22 +8,25 @@ metadata:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: manager
   namespace: system
   labels:
-    control-plane: controller-manager
+    control-plane: opendatahub-operator
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      app.kubernetes.io/name: opendatahub-operator
+      app.kubernetes.io/part-of: opendatahub
+      control-plane: opendatahub-operator
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
-        name: opendatahub-operator
+        app.kubernetes.io/name: opendatahub-operator
+        app.kubernetes.io/part-of: opendatahub
+        control-plane: opendatahub-operator
     spec:
       securityContext:
         runAsNonRoot: true
diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml
index 65b4e67a891..54548097efa 100644
--- a/config/rbac/auth_proxy_service.yaml
+++ b/config/rbac/auth_proxy_service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: opendatahub-operator
   name: controller-manager-metrics-service
   namespace: system
 spec:
@@ -12,4 +12,4 @@ spec:
     protocol: TCP
     targetPort: 8080
   selector:
-    control-plane: controller-manager
\ No newline at end of file
+    control-plane: opendatahub-operator
diff --git a/tests/e2e/odh_manager_test.go b/tests/e2e/odh_manager_test.go
index 4bd39a515ff..39e7e1012eb 100644
--- a/tests/e2e/odh_manager_test.go
+++ b/tests/e2e/odh_manager_test.go
@@ -16,7 +16,7 @@ func testODHOperatorValidation(t *testing.T) {
 
 func (tc *testContext) testODHDeployment(t *testing.T) {
 	// Verify if the operator deployment is created
-	require.NoErrorf(t, tc.waitForControllerDeployment("opendatahub-operator-controller-manager", 1),
+	require.NoErrorf(t, tc.waitForControllerDeployment("opendatahub-operator-manager", 1),
 		"error in validating odh operator deployment")
 }