diff --git a/config/default-hub/kustomization.yaml b/config/default-hub/kustomization.yaml
index b901e5cbf..125202b20 100644
--- a/config/default-hub/kustomization.yaml
+++ b/config/default-hub/kustomization.yaml
@@ -7,10 +7,6 @@ namespace: openshift-kmm-hub
 namePrefix: kmm-operator-hub-
 
 # Labels to add to all resources and selectors.
-commonLabels:
-  app.kubernetes.io/name: kmm-hub
-  app.kubernetes.io/component: kmm-hub
-  app.kubernetes.io/part-of: kmm
 
 resources:
 - ../deploy-hub
@@ -19,4 +15,10 @@ components:
 - ../webhook-cert
 
 configurations:
-  - kustomizeconfig.yaml
+- kustomizeconfig.yaml
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/component: kmm-hub
+    app.kubernetes.io/name: kmm-hub
+    app.kubernetes.io/part-of: kmm
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 959f98854..7eb9760fa 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -13,10 +13,12 @@ namespace: openshift-kmm
 namePrefix: kmm-operator-
 
 # Labels to add to all resources and selectors.
-commonLabels:
-  app.kubernetes.io/name: kmm
-  app.kubernetes.io/component: kmm
-  app.kubernetes.io/part-of: kmm
 
 configurations:
 - kustomizeconfig.yaml
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/component: kmm
+    app.kubernetes.io/name: kmm
+    app.kubernetes.io/part-of: kmm
diff --git a/config/manifests-hub/kustomization.yaml b/config/manifests-hub/kustomization.yaml
index 230cb84c3..d8dd03e22 100644
--- a/config/manifests-hub/kustomization.yaml
+++ b/config/manifests-hub/kustomization.yaml
@@ -8,3 +8,9 @@ resources:
 - ../olm-hub
 - ../samples-hub
 - ../scorecard
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/component: kmm-hub
+    app.kubernetes.io/name: kmm-hub
+    app.kubernetes.io/part-of: kmm
diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml
index 137a7ee79..237b3ff3c 100644
--- a/config/manifests/kustomization.yaml
+++ b/config/manifests/kustomization.yaml
@@ -8,3 +8,9 @@ resources:
 - ../olm
 - ../samples
 - ../scorecard
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/component: kmm
+    app.kubernetes.io/name: kmm
+    app.kubernetes.io/part-of: kmm
diff --git a/config/olm-hub/kustomization.yaml b/config/olm-hub/kustomization.yaml
index d59cf7206..e7d7b0f53 100644
--- a/config/olm-hub/kustomization.yaml
+++ b/config/olm-hub/kustomization.yaml
@@ -4,12 +4,14 @@ kind: Kustomization
 namePrefix: kmm-operator-hub-
 
 # Labels to add to all resources and selectors.
-commonLabels:
-  app.kubernetes.io/name: kmm-hub
-  app.kubernetes.io/component: kmm-hub
-  app.kubernetes.io/part-of: kmm
 
 # These resources constitute the fully configured set of manifests
 # used to generate the 'manifests/' directory in a bundle.
 resources:
 - ../deploy-hub
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/component: kmm-hub
+    app.kubernetes.io/name: kmm-hub
+    app.kubernetes.io/part-of: kmm
diff --git a/config/olm/kustomization.yaml b/config/olm/kustomization.yaml
index af67c0789..0c1feef8e 100644
--- a/config/olm/kustomization.yaml
+++ b/config/olm/kustomization.yaml
@@ -4,12 +4,14 @@ kind: Kustomization
 namePrefix: kmm-operator-
 
 # Labels to add to all resources and selectors.
-commonLabels:
-  app.kubernetes.io/name: kmm
-  app.kubernetes.io/component: kmm
-  app.kubernetes.io/part-of: kmm
 
 # These resources constitute the fully configured set of manifests
 # used to generate the 'manifests/' directory in a bundle.
 resources:
-  - ../deploy
+- ../deploy
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/component: kmm
+    app.kubernetes.io/name: kmm
+    app.kubernetes.io/part-of: kmm
diff --git a/config/webhook-server/kustomization.yaml b/config/webhook-server/kustomization.yaml
index 5c0e5cfa3..80f94030d 100644
--- a/config/webhook-server/kustomization.yaml
+++ b/config/webhook-server/kustomization.yaml
@@ -4,10 +4,12 @@ kind: Kustomization
 resources:
 - deployment.yaml
 
-commonLabels:
-  app.kubernetes.io/component: webhook-server
 
 images:
 - name: webhook-server
   newName: quay.io/edge-infrastructure/kernel-module-management-webhook-server
   newTag: latest
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/component: webhook-server