diff --git a/Makefile b/Makefile
index f1a46c57e..594bc8e83 100644
--- a/Makefile
+++ b/Makefile
@@ -367,7 +367,7 @@ endif
 bundle: build manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
 	$(OPERATOR_SDK) generate kustomize manifests -q
 	cd config/operator/deployment/ && $(KUSTOMIZE) edit set image controller=$(IMG) && \
-	$(KUSTOMIZE) edit add patch --kind Deployment --name controller-operator --namespace system --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/0/env/0\", \"value\": {\"name\": \"OPENSTACK_RELEASE_VERSION\", \"value\": \"$(OPENSTACK_RELEASE_VERSION)\"}}]"
+	$(KUSTOMIZE) edit add patch --kind Deployment --name openstack-operator-controller-operator --namespace system --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/0/env/0\", \"value\": {\"name\": \"OPENSTACK_RELEASE_VERSION\", \"value\": \"$(OPENSTACK_RELEASE_VERSION)\"}}]"
 	sed -i -e 's|operator:image|$(IMG)|' config/operator/deployment/deployment.yaml
 	$(KUSTOMIZE) build config/operator --load-restrictor='LoadRestrictionsNone' | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
 	$(OPERATOR_SDK) bundle validate ./bundle
diff --git a/config/operator/deployment/deployment.yaml b/config/operator/deployment/deployment.yaml
index 781933ea1..ba7047874 100644
--- a/config/operator/deployment/deployment.yaml
+++ b/config/operator/deployment/deployment.yaml
@@ -2,17 +2,17 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: controller-operator
+    control-plane: openstack-operator-controller-operator
     openstack.org/operator-name: openstack
   name: system
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-operator
+  name: openstack-operator-controller-operator
   namespace: system
   labels:
-    control-plane: controller-operator
+    control-plane: openstack-operator-controller-operator
     openstack.org/operator-name: openstack-controller
 spec:
   selector:
@@ -24,7 +24,7 @@ spec:
       annotations:
         kubectl.kubernetes.io/default-container: operator
       labels:
-        control-plane: controller-operator
+        control-plane: openstack-operator-controller-operator
         openstack.org/operator-name: openstack-controller
     spec:
       securityContext:
@@ -77,5 +77,5 @@ spec:
           requests:
             cpu: 10m
             memory: 128Mi
-      serviceAccountName: controller-operator
+      serviceAccountName: openstack-operator-controller-operator
       terminationGracePeriodSeconds: 10
diff --git a/config/operator/manager_operator_images.yaml b/config/operator/manager_operator_images.yaml
index ded483abb..d89b6892a 100644
--- a/config/operator/manager_operator_images.yaml
+++ b/config/operator/manager_operator_images.yaml
@@ -5,7 +5,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-operator
+  name: openstack-operator-controller-operator
   namespace: system
 spec:
   template:
diff --git a/config/operator/rbac/auth_proxy_role_binding.yaml b/config/operator/rbac/auth_proxy_role_binding.yaml
index 440225c75..cd3f0efeb 100644
--- a/config/operator/rbac/auth_proxy_role_binding.yaml
+++ b/config/operator/rbac/auth_proxy_role_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: proxy-role-operator
 subjects:
 - kind: ServiceAccount
-  name: controller-operator
+  name: openstack-operator-controller-operator
   namespace: system
diff --git a/config/operator/rbac/auth_proxy_service.yaml b/config/operator/rbac/auth_proxy_service.yaml
index 36e384520..30d060521 100644
--- a/config/operator/rbac/auth_proxy_service.yaml
+++ b/config/operator/rbac/auth_proxy_service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane: controller-operator
+    control-plane: openstack-operator-controller-operator
   name: controller-operator-metrics-service-operator
   namespace: system
 spec:
diff --git a/config/operator/rbac/leader_election_role_binding.yaml b/config/operator/rbac/leader_election_role_binding.yaml
index 80e2f271c..949093d62 100644
--- a/config/operator/rbac/leader_election_role_binding.yaml
+++ b/config/operator/rbac/leader_election_role_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: leader-election-role-operator
 subjects:
 - kind: ServiceAccount
-  name: controller-operator
+  name: openstack-operator-controller-operator
   namespace: system
diff --git a/config/operator/rbac/role_binding.yaml b/config/operator/rbac/role_binding.yaml
index edc1eb232..4d6ab18d8 100644
--- a/config/operator/rbac/role_binding.yaml
+++ b/config/operator/rbac/role_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: operator-role
 subjects:
 - kind: ServiceAccount
-  name: controller-operator
+  name: openstack-operator-controller-operator
   namespace: system
diff --git a/hack/sync-bindata.sh b/hack/sync-bindata.sh
index 35ef30322..a4ceb0a4d 100755
--- a/hack/sync-bindata.sh
+++ b/hack/sync-bindata.sh
@@ -252,7 +252,7 @@ cat > ../config/operator/manager_operator_images.yaml <<EOF_CAT
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-operator
+  name: openstack-operator-controller-operator
   namespace: system
 spec:
   template: