diff --git a/bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml b/bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml
index 72dae303c..3b78cbe85 100644
--- a/bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml
+++ b/bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml
@@ -166,14 +166,14 @@ spec:
           - subjectaccessreviews
           verbs:
           - create
-        serviceAccountName: kmm-operator-hub-controller-manager
+        serviceAccountName: kmm-operator-hub-controller
       deployments:
       - label:
           app.kubernetes.io/component: kmm-hub
           app.kubernetes.io/name: kmm-hub
           app.kubernetes.io/part-of: kmm
-          control-plane: controller-manager
-        name: kmm-operator-hub-controller-manager
+          control-plane: controller
+        name: kmm-operator-hub-controller
         spec:
           replicas: 1
           selector:
@@ -181,7 +181,7 @@ spec:
               app.kubernetes.io/component: kmm-hub
               app.kubernetes.io/name: kmm-hub
               app.kubernetes.io/part-of: kmm
-              control-plane: controller-manager
+              control-plane: controller
           strategy: {}
           template:
             metadata:
@@ -191,11 +191,11 @@ spec:
                 app.kubernetes.io/component: kmm-hub
                 app.kubernetes.io/name: kmm-hub
                 app.kubernetes.io/part-of: kmm
-                control-plane: controller-manager
+                control-plane: controller
             spec:
               containers:
               - args:
-                - --config=controller_manager_config.yaml
+                - --config=controller_config.yaml
                 command:
                 - /usr/local/bin/manager
                 env:
@@ -247,9 +247,9 @@ spec:
                 - mountPath: /etc/pki/ca-trust/extracted/pem
                   name: trusted-ca
                   readOnly: true
-                - mountPath: /controller_manager_config.yaml
+                - mountPath: /controller_config.yaml
                   name: manager-config
-                  subPath: controller_manager_config.yaml
+                  subPath: controller_config.yaml
               - args:
                 - --secure-listen-address=0.0.0.0:8443
                 - --upstream=http://127.0.0.1:8080/
@@ -279,7 +279,7 @@ spec:
                 runAsNonRoot: true
                 seccompProfile:
                   type: RuntimeDefault
-              serviceAccountName: kmm-operator-hub-controller-manager
+              serviceAccountName: kmm-operator-hub-controller
               terminationGracePeriodSeconds: 10
               tolerations:
               - effect: NoSchedule
@@ -332,7 +332,7 @@ spec:
           - update
           - patch
           - delete
-        serviceAccountName: kmm-operator-hub-controller-manager
+        serviceAccountName: kmm-operator-hub-controller
     strategy: deployment
   installModes:
   - supported: true
@@ -361,7 +361,7 @@ spec:
   - admissionReviewVersions:
     - v1
     containerPort: 443
-    deploymentName: kmm-operator-hub-controller-manager
+    deploymentName: kmm-operator-hub-controller
     failurePolicy: Fail
     generateName: vmanagedclustermodule.kb.io
     rules:
diff --git a/bundle-hub/manifests/kmm-operator-hub-controller-manager-metrics-service_v1_service.yaml b/bundle-hub/manifests/kmm-operator-hub-controller-metrics-service_v1_service.yaml
similarity index 75%
rename from bundle-hub/manifests/kmm-operator-hub-controller-manager-metrics-service_v1_service.yaml
rename to bundle-hub/manifests/kmm-operator-hub-controller-metrics-service_v1_service.yaml
index dccdb12dc..ae8600fa8 100644
--- a/bundle-hub/manifests/kmm-operator-hub-controller-manager-metrics-service_v1_service.yaml
+++ b/bundle-hub/manifests/kmm-operator-hub-controller-metrics-service_v1_service.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/component: kmm-hub
     app.kubernetes.io/name: kmm-hub
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
-  name: kmm-operator-hub-controller-manager-metrics-service
+    control-plane: controller
+  name: kmm-operator-hub-controller-metrics-service
 spec:
   ports:
   - name: https
@@ -18,6 +18,6 @@ spec:
     app.kubernetes.io/component: kmm-hub
     app.kubernetes.io/name: kmm-hub
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
+    control-plane: controller
 status:
   loadBalancer: {}
diff --git a/bundle-hub/manifests/kmm-operator-hub-manager-config_v1_configmap.yaml b/bundle-hub/manifests/kmm-operator-hub-manager-config_v1_configmap.yaml
index e9f473566..257ead61f 100644
--- a/bundle-hub/manifests/kmm-operator-hub-manager-config_v1_configmap.yaml
+++ b/bundle-hub/manifests/kmm-operator-hub-manager-config_v1_configmap.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  controller_manager_config.yaml: |
+  controller_config.yaml: |
     healthProbeBindAddress: :8081
     metricsBindAddress: 127.0.0.1:8080
     webhookPort: 9443
diff --git a/bundle-hub/manifests/kmm-operator-hub-webhook-service_v1_service.yaml b/bundle-hub/manifests/kmm-operator-hub-webhook-service_v1_service.yaml
index 3eb6adca2..2b93d4c94 100644
--- a/bundle-hub/manifests/kmm-operator-hub-webhook-service_v1_service.yaml
+++ b/bundle-hub/manifests/kmm-operator-hub-webhook-service_v1_service.yaml
@@ -21,6 +21,6 @@ spec:
     app.kubernetes.io/component: kmm-hub
     app.kubernetes.io/name: kmm-hub
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
+    control-plane: controller
 status:
   loadBalancer: {}
diff --git a/bundle/manifests/kernel-module-management.clusterserviceversion.yaml b/bundle/manifests/kernel-module-management.clusterserviceversion.yaml
index 48321bde9..7ec5d9edb 100644
--- a/bundle/manifests/kernel-module-management.clusterserviceversion.yaml
+++ b/bundle/manifests/kernel-module-management.clusterserviceversion.yaml
@@ -301,14 +301,14 @@ spec:
           - subjectaccessreviews
           verbs:
           - create
-        serviceAccountName: kmm-operator-controller-manager
+        serviceAccountName: kmm-operator-controller
       deployments:
       - label:
           app.kubernetes.io/component: kmm
           app.kubernetes.io/name: kmm
           app.kubernetes.io/part-of: kmm
-          control-plane: controller-manager
-        name: kmm-operator-controller-manager
+          control-plane: controller
+        name: kmm-operator-controller
         spec:
           replicas: 1
           selector:
@@ -316,7 +316,7 @@ spec:
               app.kubernetes.io/component: kmm
               app.kubernetes.io/name: kmm
               app.kubernetes.io/part-of: kmm
-              control-plane: controller-manager
+              control-plane: controller
           strategy: {}
           template:
             metadata:
@@ -326,11 +326,11 @@ spec:
                 app.kubernetes.io/component: kmm
                 app.kubernetes.io/name: kmm
                 app.kubernetes.io/part-of: kmm
-                control-plane: controller-manager
+                control-plane: controller
             spec:
               containers:
               - args:
-                - --config=controller_manager_config.yaml
+                - --config=controller_config.yaml
                 command:
                 - /usr/local/bin/manager
                 env:
@@ -384,9 +384,9 @@ spec:
                 - mountPath: /etc/pki/ca-trust/extracted/pem
                   name: trusted-ca
                   readOnly: true
-                - mountPath: /controller_manager_config.yaml
+                - mountPath: /controller_config.yaml
                   name: manager-config
-                  subPath: controller_manager_config.yaml
+                  subPath: controller_config.yaml
               - args:
                 - --secure-listen-address=0.0.0.0:8443
                 - --upstream=http://127.0.0.1:8080/
@@ -416,7 +416,7 @@ spec:
                 runAsNonRoot: true
                 seccompProfile:
                   type: RuntimeDefault
-              serviceAccountName: kmm-operator-controller-manager
+              serviceAccountName: kmm-operator-controller
               terminationGracePeriodSeconds: 10
               tolerations:
               - effect: NoSchedule
@@ -469,7 +469,7 @@ spec:
           - update
           - patch
           - delete
-        serviceAccountName: kmm-operator-controller-manager
+        serviceAccountName: kmm-operator-controller
       - rules:
         - apiGroups:
           - security.openshift.io
@@ -518,7 +518,7 @@ spec:
   - admissionReviewVersions:
     - v1
     containerPort: 443
-    deploymentName: kmm-operator-controller-manager
+    deploymentName: kmm-operator-controller
     failurePolicy: Fail
     generateName: vmodule.kb.io
     rules:
diff --git a/bundle/manifests/kmm-operator-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml b/bundle/manifests/kmm-operator-controller-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
similarity index 75%
rename from bundle/manifests/kmm-operator-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
rename to bundle/manifests/kmm-operator-controller-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
index 96830cd3a..f66edd6e1 100644
--- a/bundle/manifests/kmm-operator-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
+++ b/bundle/manifests/kmm-operator-controller-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/component: kmm
     app.kubernetes.io/name: kmm
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
-  name: kmm-operator-controller-manager-metrics-monitor
+    control-plane: controller
+  name: kmm-operator-controller-metrics-monitor
 spec:
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
@@ -17,4 +17,4 @@ spec:
       insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: controller
diff --git a/bundle/manifests/kmm-operator-controller-manager-metrics-service_v1_service.yaml b/bundle/manifests/kmm-operator-controller-metrics-service_v1_service.yaml
similarity index 75%
rename from bundle/manifests/kmm-operator-controller-manager-metrics-service_v1_service.yaml
rename to bundle/manifests/kmm-operator-controller-metrics-service_v1_service.yaml
index 98b3b39b2..de8c073dc 100644
--- a/bundle/manifests/kmm-operator-controller-manager-metrics-service_v1_service.yaml
+++ b/bundle/manifests/kmm-operator-controller-metrics-service_v1_service.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/component: kmm
     app.kubernetes.io/name: kmm
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
-  name: kmm-operator-controller-manager-metrics-service
+    control-plane: controller
+  name: kmm-operator-controller-metrics-service
 spec:
   ports:
   - name: https
@@ -18,6 +18,6 @@ spec:
     app.kubernetes.io/component: kmm
     app.kubernetes.io/name: kmm
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
+    control-plane: controller
 status:
   loadBalancer: {}
diff --git a/bundle/manifests/kmm-operator-manager-config_v1_configmap.yaml b/bundle/manifests/kmm-operator-manager-config_v1_configmap.yaml
index c5f0f06ee..04eafbfee 100644
--- a/bundle/manifests/kmm-operator-manager-config_v1_configmap.yaml
+++ b/bundle/manifests/kmm-operator-manager-config_v1_configmap.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  controller_manager_config.yaml: |
+  controller_config.yaml: |
     healthProbeBindAddress: :8081
     metricsBindAddress: 127.0.0.1:8080
     leaderElection:
diff --git a/bundle/manifests/kmm-operator-webhook-service_v1_service.yaml b/bundle/manifests/kmm-operator-webhook-service_v1_service.yaml
index 84ba822c4..409f700d8 100644
--- a/bundle/manifests/kmm-operator-webhook-service_v1_service.yaml
+++ b/bundle/manifests/kmm-operator-webhook-service_v1_service.yaml
@@ -21,6 +21,6 @@ spec:
     app.kubernetes.io/component: kmm
     app.kubernetes.io/name: kmm
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
+    control-plane: controller
 status:
   loadBalancer: {}
diff --git a/ci/install-ci-spoke/kustomization.yaml b/ci/install-ci-spoke/kustomization.yaml
index 2f7ec24a7..4ca0f161f 100644
--- a/ci/install-ci-spoke/kustomization.yaml
+++ b/ci/install-ci-spoke/kustomization.yaml
@@ -9,7 +9,7 @@ patchesStrategicMerge:
     apiVersion: apps/v1
     kind: Deployment
     metadata:
-      name: controller-manager
+      name: controller
       namespace: system
     spec:
       template:
diff --git a/ci/prow/e2e-hub-spoke-incluster-build b/ci/prow/e2e-hub-spoke-incluster-build
index 0555de49a..f19f6db8c 100755
--- a/ci/prow/e2e-hub-spoke-incluster-build
+++ b/ci/prow/e2e-hub-spoke-incluster-build
@@ -36,7 +36,7 @@ if [ "$SKIP_MAKE_DEPLOY_HUB" == true ]; then
 else
   echo "Deploy KMMO-Hub..."
   make deploy-hub KUSTOMIZE_CONFIG_HUB_DEFAULT=ci/install-ci-hub
-  oc wait --for=condition=Available --timeout=1m deployment/kmm-operator-hub-controller-manager -n ${OPERATOR_NAMESPACE}
+  oc wait --for=condition=Available --timeout=1m deployment/kmm-operator-hub-controller -n ${OPERATOR_NAMESPACE}
 fi
 
 if [ "$SKIP_MAKE_DEPLOY" == true ]; then
@@ -44,7 +44,7 @@ if [ "$SKIP_MAKE_DEPLOY" == true ]; then
 else
   echo "Deploy KMM..."
   make deploy KUSTOMIZE_CONFIG_DEFAULT=ci/install-ci-spoke
-  oc wait --for=condition=Available --timeout=1m deployment/kmm-operator-controller-manager -n ${OPERATOR_NAMESPACE}
+  oc wait --for=condition=Available --timeout=1m deployment/kmm-operator-controller -n ${OPERATOR_NAMESPACE}
 fi
 
 # Apply the ManagedClusterModule
diff --git a/ci/prow/e2e-incluster-build b/ci/prow/e2e-incluster-build
index 46bff903a..21207a547 100755
--- a/ci/prow/e2e-incluster-build
+++ b/ci/prow/e2e-incluster-build
@@ -47,7 +47,7 @@ oc apply -f ci/kmm-kmod-dockerfile.yaml
 echo "Add Secrets containing the signing key and certificate..."
 oc apply -f ci/secret_kmm-kmod-signing.yaml
 
-oc wait --for=condition=Available deployment/kmm-operator-controller-manager -n openshift-kmm
+oc wait --for=condition=Available deployment/kmm-operator-controller -n openshift-kmm
 
 echo "Add an kmm-ci Module that contains a valid mapping..."
 oc apply -f ci/module-kmm-ci-build-sign.yaml
diff --git a/config/default-hub/kustomizeconfig.yaml b/config/default-hub/kustomizeconfig.yaml
index 7868ddfb0..23de4661e 100644
--- a/config/default-hub/kustomizeconfig.yaml
+++ b/config/default-hub/kustomizeconfig.yaml
@@ -1,4 +1,4 @@
 namePrefix:
 - kind: Deployment
-  name: controller-manager
+  name: controller
   path: spec/template/spec/volumes/secret/secretName
diff --git a/config/default-hub/manager_webhook_patch.yaml b/config/default-hub/manager_webhook_patch.yaml
index 738de350b..349289c3d 100644
--- a/config/default-hub/manager_webhook_patch.yaml
+++ b/config/default-hub/manager_webhook_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:
diff --git a/config/default/kustomizeconfig.yaml b/config/default/kustomizeconfig.yaml
index 7868ddfb0..23de4661e 100644
--- a/config/default/kustomizeconfig.yaml
+++ b/config/default/kustomizeconfig.yaml
@@ -1,4 +1,4 @@
 namePrefix:
 - kind: Deployment
-  name: controller-manager
+  name: controller
   path: spec/template/spec/volumes/secret/secretName
diff --git a/config/default/manager_webhook_patch.yaml b/config/default/manager_webhook_patch.yaml
index 738de350b..349289c3d 100644
--- a/config/default/manager_webhook_patch.yaml
+++ b/config/default/manager_webhook_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:
diff --git a/config/manager-base/manager.yaml b/config/manager-base/manager.yaml
index 1974efc02..b756c0563 100644
--- a/config/manager-base/manager.yaml
+++ b/config/manager-base/manager.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: controller
     security.openshift.io/scc.podSecurityLabelSync: 'true'
     openshift.io/cluster-monitoring: "true"
   name: system
@@ -10,21 +10,21 @@ metadata:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
   labels:
-    control-plane: controller-manager
+    control-plane: controller
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: controller
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
+        control-plane: controller
     spec:
       affinity:
         nodeAffinity:
@@ -74,7 +74,7 @@ spec:
           requests:
             cpu: 10m
             memory: 64Mi
-      serviceAccountName: controller-manager
+      serviceAccountName: controller
       terminationGracePeriodSeconds: 10
       tolerations:
         - key: node-role.kubernetes.io/master
diff --git a/config/manager-base/manager_auth_proxy_patch.yaml b/config/manager-base/manager_auth_proxy_patch.yaml
index ff5aeb555..858d92f74 100644
--- a/config/manager-base/manager_auth_proxy_patch.yaml
+++ b/config/manager-base/manager_auth_proxy_patch.yaml
@@ -3,7 +3,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:
@@ -30,4 +30,4 @@ spec:
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
-            drop: [ALL]
\ No newline at end of file
+            drop: [ALL]
diff --git a/config/manager-base/manager_config_patch.yaml b/config/manager-base/manager_config_patch.yaml
index 6c400155c..1e6a61b39 100644
--- a/config/manager-base/manager_config_patch.yaml
+++ b/config/manager-base/manager_config_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:
@@ -9,11 +9,11 @@ spec:
       containers:
       - name: manager
         args:
-        - "--config=controller_manager_config.yaml"
+        - "--config=controller_config.yaml"
         volumeMounts:
         - name: manager-config
-          mountPath: /controller_manager_config.yaml
-          subPath: controller_manager_config.yaml
+          mountPath: /controller_config.yaml
+          subPath: controller_config.yaml
       volumes:
       - name: manager-config
         configMap:
diff --git a/config/manager-base/ocp.patch.yaml b/config/manager-base/ocp.patch.yaml
index 39ad5277c..9a282e224 100644
--- a/config/manager-base/ocp.patch.yaml
+++ b/config/manager-base/ocp.patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:
diff --git a/config/manager-hub/controller_manager_config.yaml b/config/manager-hub/controller_config.yaml
similarity index 100%
rename from config/manager-hub/controller_manager_config.yaml
rename to config/manager-hub/controller_config.yaml
diff --git a/config/manager-hub/kustomization.yaml b/config/manager-hub/kustomization.yaml
index d2782913b..c89331605 100644
--- a/config/manager-hub/kustomization.yaml
+++ b/config/manager-hub/kustomization.yaml
@@ -11,7 +11,7 @@ images:
 
 configMapGenerator:
 - files:
-  - controller_manager_config.yaml
+  - controller_config.yaml
   name: manager-config
 
 generatorOptions:
diff --git a/config/manager/controller_manager_config.yaml b/config/manager/controller_config.yaml
similarity index 100%
rename from config/manager/controller_manager_config.yaml
rename to config/manager/controller_config.yaml
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 532b82183..2f4e6fb18 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -17,7 +17,7 @@ images:
 
 configMapGenerator:
 - files:
-  - controller_manager_config.yaml
+  - controller_config.yaml
   name: manager-config
 
 generatorOptions:
diff --git a/config/manager/manager_worker_image_patch.yaml b/config/manager/manager_worker_image_patch.yaml
index 84760f775..e4cb217f5 100644
--- a/config/manager/manager_worker_image_patch.yaml
+++ b/config/manager/manager_worker_image_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:
diff --git a/config/manifests-hub/kustomization.yaml b/config/manifests-hub/kustomization.yaml
index fdb9270d0..63c459b49 100644
--- a/config/manifests-hub/kustomization.yaml
+++ b/config/manifests-hub/kustomization.yaml
@@ -17,7 +17,7 @@ resources:
 #    group: apps
 #    version: v1
 #    kind: Deployment
-#    name: controller-manager
+#    name: controller
 #    namespace: system
 #  patch: |-
 #    # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.
diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml
index 6c96c0276..5a087f692 100644
--- a/config/manifests/kustomization.yaml
+++ b/config/manifests/kustomization.yaml
@@ -17,7 +17,7 @@ resources:
 #    group: apps
 #    version: v1
 #    kind: Deployment
-#    name: controller-manager
+#    name: controller
 #    namespace: system
 #  patch: |-
 #    # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.
diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml
index 29e210a98..07a37ecdc 100644
--- a/config/prometheus/monitor.yaml
+++ b/config/prometheus/monitor.yaml
@@ -4,8 +4,8 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    control-plane: controller-manager
-  name: controller-manager-metrics-monitor
+    control-plane: controller
+  name: controller-metrics-monitor
   namespace: system
 spec:
   endpoints:
@@ -17,7 +17,7 @@ spec:
         insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: controller
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
diff --git a/config/rbac-base/auth_proxy_role_binding.yaml b/config/rbac-base/auth_proxy_role_binding.yaml
index ec7acc0a1..14874d6fc 100644
--- a/config/rbac-base/auth_proxy_role_binding.yaml
+++ b/config/rbac-base/auth_proxy_role_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: proxy-role
 subjects:
 - kind: ServiceAccount
-  name: controller-manager
+  name: controller
   namespace: system
diff --git a/config/rbac-base/auth_proxy_service.yaml b/config/rbac-base/auth_proxy_service.yaml
index 71f179727..10484df2b 100644
--- a/config/rbac-base/auth_proxy_service.yaml
+++ b/config/rbac-base/auth_proxy_service.yaml
@@ -2,8 +2,8 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane: controller-manager
-  name: controller-manager-metrics-service
+    control-plane: controller
+  name: controller-metrics-service
   namespace: system
 spec:
   ports:
@@ -12,4 +12,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    control-plane: controller-manager
+    control-plane: controller
diff --git a/config/rbac-base/event_recorder_clusterrole_binding.yaml b/config/rbac-base/event_recorder_clusterrole_binding.yaml
index 6dd998160..8455c38a6 100644
--- a/config/rbac-base/event_recorder_clusterrole_binding.yaml
+++ b/config/rbac-base/event_recorder_clusterrole_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: event-recorder-clusterrole
 subjects:
 - kind: ServiceAccount
-  name: controller-manager
+  name: controller
   namespace: system
diff --git a/config/rbac-base/leader_election_role_binding.yaml b/config/rbac-base/leader_election_role_binding.yaml
index 1d1321ed4..b9896dd0e 100644
--- a/config/rbac-base/leader_election_role_binding.yaml
+++ b/config/rbac-base/leader_election_role_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: controller-manager
+  name: controller
   namespace: system
diff --git a/config/rbac-base/role_binding.yaml b/config/rbac-base/role_binding.yaml
index 2070ede44..6a4e99858 100644
--- a/config/rbac-base/role_binding.yaml
+++ b/config/rbac-base/role_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: manager-role
 subjects:
 - kind: ServiceAccount
-  name: controller-manager
+  name: controller
   namespace: system
diff --git a/config/rbac-base/service_account.yaml b/config/rbac-base/service_account.yaml
index 7cd6025bf..130eeec1f 100644
--- a/config/rbac-base/service_account.yaml
+++ b/config/rbac-base/service_account.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
diff --git a/config/webhook-hub/service.yaml b/config/webhook-hub/service.yaml
index 3ea67a1fc..ffd27f99f 100644
--- a/config/webhook-hub/service.yaml
+++ b/config/webhook-hub/service.yaml
@@ -18,4 +18,4 @@ spec:
       protocol: TCP
       targetPort: 9443
   selector:
-    control-plane: controller-manager
+    control-plane: controller
diff --git a/config/webhook/service.yaml b/config/webhook/service.yaml
index dc6cbccb3..d3725ae00 100644
--- a/config/webhook/service.yaml
+++ b/config/webhook/service.yaml
@@ -19,4 +19,4 @@ spec:
       protocol: TCP
       targetPort: 9443
   selector:
-    control-plane: controller-manager
+    control-plane: controller
diff --git a/docs/mkdocs/documentation/install.md b/docs/mkdocs/documentation/install.md
index 748bfee3e..64a232286 100644
--- a/docs/mkdocs/documentation/install.md
+++ b/docs/mkdocs/documentation/install.md
@@ -116,6 +116,6 @@ volumes:
 Run the following commands:
 ```shell
 oc apply -f restricted-v2.yml
-oc adm policy add-scc-to-user restricted-v2 -z kmm-operator-controller-manager -n openshift-kmm
+oc adm policy add-scc-to-user restricted-v2 -z kmm-operator-controller -n openshift-kmm
 ```
 </details>
diff --git a/docs/mkdocs/documentation/troubleshooting.md b/docs/mkdocs/documentation/troubleshooting.md
index c43fefd10..693e55e23 100644
--- a/docs/mkdocs/documentation/troubleshooting.md
+++ b/docs/mkdocs/documentation/troubleshooting.md
@@ -8,14 +8,14 @@ support.
 ### For KMM
 
 ```shell
-export MUST_GATHER_IMAGE=$(oc get deployment -n openshift-kmm kmm-operator-controller-manager -ojsonpath='{.spec.template.spec.containers[?(@.name=="manager")].env[?(@.name=="RELATED_IMAGES_MUST_GATHER")].value}')
+export MUST_GATHER_IMAGE=$(oc get deployment -n openshift-kmm kmm-operator-controller -ojsonpath='{.spec.template.spec.containers[?(@.name=="manager")].env[?(@.name=="RELATED_IMAGES_MUST_GATHER")].value}')
 oc adm must-gather --image="${MUST_GATHER_IMAGE}" -- /usr/bin/gather
 ```
 
 ### For KMM-Hub
 
 ```shell
-export MUST_GATHER_IMAGE=$(oc get deployment -n openshift-kmm-hub kmm-operator-hub-controller-manager -ojsonpath='{.spec.template.spec.containers[?(@.name=="manager")].env[?(@.name=="RELATED_IMAGES_MUST_GATHER")].value}')
+export MUST_GATHER_IMAGE=$(oc get deployment -n openshift-kmm-hub kmm-operator-hub-controller -ojsonpath='{.spec.template.spec.containers[?(@.name=="manager")].env[?(@.name=="RELATED_IMAGES_MUST_GATHER")].value}')
 oc adm must-gather --image="${MUST_GATHER_IMAGE}" -- /usr/bin/gather -u
 ```
 
@@ -25,10 +25,10 @@ Use the `-n NAMESPACE` switch to specify a namespace if you installed KMM in a c
 
 ## Reading operator logs
 
-| Component | Command                                                                         |
-|-----------|---------------------------------------------------------------------------------|
-| KMM       | `oc logs -fn openshift-kmm deployments/kmm-operator-controller-manager`         |
-| KMM-Hub   | `oc logs -fn openshift-kmm-hub deployments/kmm-operator-hub-controller-manager` |
+| Component | Command                                                                 |
+|-----------|-------------------------------------------------------------------------|
+| KMM       | `oc logs -fn openshift-kmm deployments/kmm-operator-controller`         |
+| KMM-Hub   | `oc logs -fn openshift-kmm-hub deployments/kmm-operator-hub-controller` |
 
 ## Building and Signing work but the ModuelLoader isn't running.
 
diff --git a/docs/mkdocs/lab.md b/docs/mkdocs/lab.md
index 67d3dca8e..4bc388041 100644
--- a/docs/mkdocs/lab.md
+++ b/docs/mkdocs/lab.md
@@ -360,7 +360,7 @@ In addition to standard OpenShift tools such as [must-gather](https://docs.opens
 
 1. Operator logs:
 ```
-oc logs -fn openshift-kmm deployments/kmm-operator-controller-manager
+oc logs -fn openshift-kmm deployments/kmm-operator-controller
 ```
 2. Module pod logs:
 ```
diff --git a/docs/mkdocs/labsv2.md b/docs/mkdocs/labsv2.md
index 9525ef97b..1ba7e30b2 100644
--- a/docs/mkdocs/labsv2.md
+++ b/docs/mkdocs/labsv2.md
@@ -414,7 +414,7 @@ In addition to standard OpenShift tools such as [must-gather](https://docs.opens
 
 1. Operator logs:
 ```
-oc logs -fn openshift-kmm deployments/kmm-operator-controller-manager
+oc logs -fn openshift-kmm deployments/kmm-operator-controller
 ```
 2. Module object description:
 ```
diff --git a/must-gather/gather b/must-gather/gather
index 69663c6ed..2313959ad 100755
--- a/must-gather/gather
+++ b/must-gather/gather
@@ -29,7 +29,7 @@ collect() {
   oc adm inspect modules,nodemodulesconfigs,preflightvalidations,preflightvalidationsocp -A --dest-dir="$OUTPUT_DIR/inspect"
   oc adm inspect clusterclaims --dest-dir="$OUTPUT_DIR/inspect"
 
-  oc -n "$NS" logs "deployment/kmm-operator-controller-manager" > "${OUTPUT_DIR}/kmm-operator-controller-manager.log"
+  oc -n "$NS" logs "deployment/kmm-operator-controller" > "${OUTPUT_DIR}/kmm-operator-controller.log"
 
   for ns in $(oc get modules -A --no-headers -o custom-columns="NS:.metadata.namespace"); do
     echo "Collecting data in namespace ${ns}"
@@ -45,7 +45,7 @@ collect_hub() {
   oc adm inspect manifestworks -A --dest-dir="$OUTPUT_DIR/inspect"
   oc adm inspect "${BUILD_KINDS}" -n "${NS}" --dest-dir="$OUTPUT_DIR/inspect"
 
-  oc -n "$NS" logs "deployment.apps/kmm-operator-hub-controller-manager" > "${OUTPUT_DIR}/kmm-operator-hub-controller-manager.log"
+  oc -n "$NS" logs "deployment.apps/kmm-operator-hub-controller" > "${OUTPUT_DIR}/kmm-operator-hub-controller.log"
 }
 
 while getopts "hn:u" arg; do