diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 7e7cde66f..b92383f29 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -72,7 +72,7 @@ jobs:
           make deploy
       - name: Wait for deployment
         run: |
-          kubectl -n kuadrant-operator-system wait --timeout=300s --for=condition=Available deployments --all
+          kubectl -n kuadrant-system wait --timeout=300s --for=condition=Available deployments --all
       # Note: This doesn't run any actual tests yet!
       - name: Run make undeploy
         run: |
diff --git a/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml b/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml
index 70a82dc88..0091b9bf2 100644
--- a/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml
@@ -209,38 +209,26 @@ spec:
           - create
         serviceAccountName: kuadrant-operator-controller-manager
       deployments:
-      - name: kuadrant-operator-controller-manager
+      - name: kuadrant-controller-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
+              app: kuadrant
               control-plane: controller-manager
           strategy: {}
           template:
             metadata:
               labels:
+                app: kuadrant
                 control-plane: controller-manager
             spec:
               containers:
               - args:
-                - --secure-listen-address=0.0.0.0:8443
-                - --upstream=http://127.0.0.1:8080/
-                - --logtostderr=true
-                - --v=10
-                image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
-                name: kube-rbac-proxy
-                ports:
-                - containerPort: 8443
-                  name: https
-                  protocol: TCP
-                resources: {}
-              - args:
-                - --health-probe-bind-address=:8081
-                - --metrics-bind-address=127.0.0.1:8080
-                - --leader-elect
+                - --config=controller_manager_config.yaml
                 command:
                 - /manager
-                image: quay.io/kuadrant/kuadrant-operator:latest
+                image: quay.io/kuadrant/kuadrant-controller:latest
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -256,37 +244,68 @@ spec:
                   periodSeconds: 10
                 resources:
                   limits:
-                    cpu: 200m
-                    memory: 100Mi
+                    cpu: 100m
+                    memory: 30Mi
                   requests:
                     cpu: 100m
                     memory: 20Mi
                 securityContext:
                   allowPrivilegeEscalation: false
+                volumeMounts:
+                - mountPath: /controller_manager_config.yaml
+                  name: manager-config
+                  subPath: controller_manager_config.yaml
+              - args:
+                - --secure-listen-address=0.0.0.0:8443
+                - --upstream=http://127.0.0.1:8080/
+                - --logtostderr=true
+                - --v=10
+                image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+                name: kube-rbac-proxy
+                ports:
+                - containerPort: 8443
+                  name: https
+                resources: {}
               securityContext:
                 runAsNonRoot: true
-              serviceAccountName: kuadrant-operator-controller-manager
+              serviceAccountName: kuadrant-controller-manager
               terminationGracePeriodSeconds: 10
-      - name: kuadrant-controller-manager
+              volumes:
+              - configMap:
+                  name: kuadrant-manager-config
+                name: manager-config
+      - name: kuadrant-operator-controller-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
-              app: kuadrant
               control-plane: controller-manager
           strategy: {}
           template:
             metadata:
               labels:
-                app: kuadrant
                 control-plane: controller-manager
             spec:
               containers:
               - args:
-                - --config=controller_manager_config.yaml
+                - --secure-listen-address=0.0.0.0:8443
+                - --upstream=http://127.0.0.1:8080/
+                - --logtostderr=true
+                - --v=10
+                image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+                name: kube-rbac-proxy
+                ports:
+                - containerPort: 8443
+                  name: https
+                  protocol: TCP
+                resources: {}
+              - args:
+                - --health-probe-bind-address=:8081
+                - --metrics-bind-address=127.0.0.1:8080
+                - --leader-elect
                 command:
                 - /manager
-                image: quay.io/kuadrant/kuadrant-controller:latest
+                image: quay.io/kuadrant/kuadrant-operator:latest
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -302,36 +321,17 @@ spec:
                   periodSeconds: 10
                 resources:
                   limits:
-                    cpu: 100m
-                    memory: 30Mi
+                    cpu: 200m
+                    memory: 100Mi
                   requests:
                     cpu: 100m
                     memory: 20Mi
                 securityContext:
                   allowPrivilegeEscalation: false
-                volumeMounts:
-                - mountPath: /controller_manager_config.yaml
-                  name: manager-config
-                  subPath: controller_manager_config.yaml
-              - args:
-                - --secure-listen-address=0.0.0.0:8443
-                - --upstream=http://127.0.0.1:8080/
-                - --logtostderr=true
-                - --v=10
-                image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
-                name: kube-rbac-proxy
-                ports:
-                - containerPort: 8443
-                  name: https
-                resources: {}
               securityContext:
                 runAsNonRoot: true
-              serviceAccountName: kuadrant-controller-manager
+              serviceAccountName: kuadrant-operator-controller-manager
               terminationGracePeriodSeconds: 10
-              volumes:
-              - configMap:
-                  name: kuadrant-manager-config
-                name: manager-config
       permissions:
       - rules:
         - apiGroups:
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 67e616766..dcab6dcba 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -1,5 +1,5 @@
 # Adds namespace to all resources.
-namespace: kuadrant-operator-system
+namespace: kuadrant-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
diff --git a/config/dependencies/controller/kustomization.template.yaml b/config/dependencies/controller/kustomization.template.yaml
index 02a0b53d1..749dab8ce 100644
--- a/config/dependencies/controller/kustomization.template.yaml
+++ b/config/dependencies/controller/kustomization.template.yaml
@@ -1,2 +1,5 @@
 resources:
 - github.com/Kuadrant/kuadrant-controller/config/default?ref=${KUADRANT_CONTROLLER_GITREF}
+
+patchesStrategicMerge:
+  - delete-ns.yaml
diff --git a/config/dependencies/controller/kustomization.yaml b/config/dependencies/controller/kustomization.yaml
index a365daac4..678c7601a 100644
--- a/config/dependencies/controller/kustomization.yaml
+++ b/config/dependencies/controller/kustomization.yaml
@@ -1,2 +1,5 @@
 resources:
 - github.com/Kuadrant/kuadrant-controller/config/default?ref=main
+
+patchesStrategicMerge:
+  - delete-ns.yaml
diff --git a/config/dependencies/kustomization.yaml b/config/dependencies/kustomization.yaml
index 9e8d2d148..de897e9bb 100644
--- a/config/dependencies/kustomization.yaml
+++ b/config/dependencies/kustomization.yaml
@@ -1,4 +1,4 @@
-namespace: kuadrant-operator-system
+namespace: kuadrant-system
 
 resources:
   - controller
@@ -6,6 +6,5 @@ resources:
   - limitador
 
 patchesStrategicMerge:
-  - controller/delete-ns.yaml
   - authorino/delete-ns.yaml
   - limitador/delete-ns.yaml
diff --git a/config/deploy/kustomization.yaml b/config/deploy/kustomization.yaml
index 07a3d2a6e..e28931fe8 100644
--- a/config/deploy/kustomization.yaml
+++ b/config/deploy/kustomization.yaml
@@ -1,4 +1,4 @@
-namespace: kuadrant-operator-system
+namespace: kuadrant-system
 
 resources:
   - ../default
diff --git a/config/deploy/olm/kustomization.yaml b/config/deploy/olm/kustomization.yaml
index ab5fe9df5..22009d8ba 100644
--- a/config/deploy/olm/kustomization.yaml
+++ b/config/deploy/olm/kustomization.yaml
@@ -1,5 +1,5 @@
 # Adds namespace to all resources.
-namespace: kuadrant-operator-system
+namespace: kuadrant-system
 
 resources:
 - namespace.yaml
diff --git a/config/deploy/olm/subscription.yaml b/config/deploy/olm/subscription.yaml
index 095b456fa..58a9456e7 100644
--- a/config/deploy/olm/subscription.yaml
+++ b/config/deploy/olm/subscription.yaml
@@ -4,6 +4,6 @@ metadata:
   name: kuadrant
 spec:
   source: kuadrant-operator-catalog
-  sourceNamespace: kuadrant-operator-system
+  sourceNamespace: kuadrant-system
   name: kuadrant-operator
   channel: "alpha"
diff --git a/make/kind.mk b/make/kind.mk
index 6be069d3d..885e61b2a 100644
--- a/make/kind.mk
+++ b/make/kind.mk
@@ -24,4 +24,4 @@ kind-create-kuadrant-cluster: kind-create-cluster ## Create a kind cluster with
 	$(KIND) load docker-image $(IMG) --name $(KIND_CLUSTER_NAME)
 	$(MAKE) install
 	$(MAKE) deploy
-	kubectl -n kuadrant-operator-system wait --timeout=300s --for=condition=Available deployments --all
+	kubectl -n kuadrant-system wait --timeout=300s --for=condition=Available deployments --all