diff --git a/config/busola/capapplication_configMap.yaml b/config/busola/capapplication_configMap.yaml
index 21e69d0..de79915 100644
--- a/config/busola/capapplication_configMap.yaml
+++ b/config/busola/capapplication_configMap.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: capapplications.sme.sap.com
+  name: cap-operator-capapplications.sme.sap.com
   labels:
-    app.kubernetes.io/name: capapplications.sme.sap.com
-    app.kubernetes.io/instance: capapplications.sme.sap.com
+    app.kubernetes.io/name: cap-operator-capapplications.sme.sap.com
+    app.kubernetes.io/instance: cap-operator-capapplications.sme.sap.com
     app.kubernetes.io/component: configmap
     busola.io/extension: resource
     busola.io/extension-version: '0.5'
@@ -97,7 +97,7 @@ data:
         widget: EventList
         filter: '$matchEvents($$, $root.kind, $root.metadata.name)'
         defaultType: all
-        hideInvolvedObjects: true         
+        hideInvolvedObjects: true
   form: |
     []
   general: |
@@ -132,4 +132,4 @@ data:
   translations: |
     en:
       metadata.annotations: Annotations
-      metadata.labels: Labels
\ No newline at end of file
+      metadata.labels: Labels
diff --git a/config/busola/capapplicationversion_configMap.yaml b/config/busola/capapplicationversion_configMap.yaml
index abc065f..946fe18 100644
--- a/config/busola/capapplicationversion_configMap.yaml
+++ b/config/busola/capapplicationversion_configMap.yaml
@@ -1,16 +1,16 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: capapplicationversions.sme.sap.com
+  name: cap-operator-capapplicationversions.sme.sap.com
   labels:
-    app.kubernetes.io/name: capapplicationversions.sme.sap.com
-    app.kubernetes.io/instance: capapplicationversions.sme.sap.com
+    app.kubernetes.io/name: cap-operator-capapplicationversions.sme.sap.com
+    app.kubernetes.io/instance: cap-operator-capapplicationversions.sme.sap.com
     app.kubernetes.io/component: configmap
     busola.io/extension: resource
     busola.io/extension-version: '0.5'
 data:
   details: |
-    header: 
+    header:
       - source: metadata.ownerReferences
         widget: ControlledBy
         name: Owned By
diff --git a/config/busola/capoperator_configMap.yaml b/config/busola/capoperator_configMap.yaml
index e62b2b6..3e51a34 100644
--- a/config/busola/capoperator_configMap.yaml
+++ b/config/busola/capoperator_configMap.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: capoperators.operator.sme.sap.com
+  name: cap-operator-capoperators.operator.sme.sap.com
   labels:
-    app.kubernetes.io/name: capoperators.operator.sme.sap.com
-    app.kubernetes.io/instance: capoperators.operator.sme.sap.com
+    app.kubernetes.io/name: cap-operator-capoperators.operator.sme.sap.com
+    app.kubernetes.io/instance: cap-operator-capoperators.operator.sme.sap.com
     app.kubernetes.io/component: configmap
     busola.io/extension: resource
     busola.io/extension-version: '0.5'
diff --git a/config/busola/captenant_configMap.yaml b/config/busola/captenant_configMap.yaml
index 82b386f..4ea12c1 100644
--- a/config/busola/captenant_configMap.yaml
+++ b/config/busola/captenant_configMap.yaml
@@ -1,10 +1,10 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: captenants.sme.sap.com
+  name: cap-operator-captenants.sme.sap.com
   labels:
-    app.kubernetes.io/name: captenants.sme.sap.com
-    app.kubernetes.io/instance: captenants.sme.sap.com
+    app.kubernetes.io/name: cap-operator-captenants.sme.sap.com
+    app.kubernetes.io/instance: cap-operator-captenants.sme.sap.com
     app.kubernetes.io/component: configmap
     busola.io/extension: resource
     busola.io/extension-version: '0.5'
@@ -42,7 +42,7 @@ data:
             source: spec.version
           - name: Version Upgrade Strategy
             source: >-
-              spec.versionUpgradeStrategy = "always" ? "Always" : "Never" 
+              spec.versionUpgradeStrategy = "always" ? "Always" : "Never"
           - name: Current CAP Application Version
             source: status.currentCAPApplicationVersionInstance
             widget: ResourceLink
@@ -177,4 +177,4 @@ data:
     en:
       metadata.annotations: Annotations
       metadata.labels: Labels
-      metadata.creationTimestamp: Created at
\ No newline at end of file
+      metadata.creationTimestamp: Created at
diff --git a/config/busola/captenantoperation_configMap.yaml b/config/busola/captenantoperation_configMap.yaml
index 01557b4..1b8967a 100644
--- a/config/busola/captenantoperation_configMap.yaml
+++ b/config/busola/captenantoperation_configMap.yaml
@@ -1,10 +1,10 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: captenantoperations.sme.sap.com
+  name: cap-operator-captenantoperations.sme.sap.com
   labels:
-    app.kubernetes.io/name: captenantoperations.sme.sap.com
-    app.kubernetes.io/instance: captenantoperations.sme.sap.com
+    app.kubernetes.io/name: cap-operator-captenantoperations.sme.sap.com
+    app.kubernetes.io/instance: cap-operator-captenantoperations.sme.sap.com
     app.kubernetes.io/component: configmap
     busola.io/extension: resource
     busola.io/extension-version: '0.5'
@@ -15,10 +15,10 @@ data:
         kind: Job
         group: batch
         version: v1
-      filter: >- 
+      filter: >-
         $item.metadata.annotations.`sme.sap.com/owner-identifier` = $join([$root.metadata.namespace,".",$root.metadata.name])
   details: |
-    header: 
+    header:
       - source: metadata.ownerReferences
         widget: ControlledBy
         name: Owned By
@@ -109,4 +109,4 @@ data:
     en:
       metadata.annotations: Annotations
       metadata.labels: Labels
-      metadata.creationTimestamp: Created at
\ No newline at end of file
+      metadata.creationTimestamp: Created at
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index d8f5855..0b715c0 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -4,14 +4,14 @@ kind: Kustomization
 # Adds namespace to all resources.
 namespace: cap-operator-system
 
-# Value of this field is prepended to the names of all resources, 
+# Value of this field is prepended to the names of all resources,
 # e.g. a deployment named "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace field above.
 # namePrefix: cap-operator-
 
 # Labels to add to all resources and selectors.
 labels:
-- includeSelectors: true
+- includeSelectors: false
   pairs:
     app.kubernetes.io/version: latest
     kyma-project.io/module: cap-operator
@@ -26,4 +26,4 @@ resources:
 images:
 - name: controller
   newName: ghcr.io/sap/cap-operator-lifecycle/cap-operator-manager
-  newTag: latest
\ No newline at end of file
+  newTag: latest
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index a5e1bfe..bc04c3a 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -18,13 +18,20 @@ metadata:
     app.kubernetes.io/component: controller
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/part-of: cap-operator-manager
+      kyma-project.io/module: cap-operator
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
+      labels:
+        app.kubernetes.io/part-of: cap-operator-manager
+        kyma-project.io/module: cap-operator
     spec:
       # TODO(user): Uncomment the following code to configure the nodeAffinity expression
-      # according to the platforms which are supported by your solution. 
+      # according to the platforms which are supported by your solution.
       # It is considered best practice to support multiple architectures. You can
       # build your manager image using the makefile target docker-buildx.
       # affinity: