diff --git a/config/base/kustomization.yaml b/config/base/kustomization.yaml
index e0b4fa3..9a67454 100644
--- a/config/base/kustomization.yaml
+++ b/config/base/kustomization.yaml
@@ -2,8 +2,18 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../default
-images:
-  - name: quay.io/opendatahub/odh-project-controller
-    newName: quay.io/opendatahub/odh-project-controller
-    newTag: latest
+  - ../rbac
+  - ../manager
+
+# Adds namespace to all resources.
+namespace: odh-project-controller-system
+
+namePrefix: odh-project-controller-
+
+commonLabels:
+  app: opendatahub-project-controller
+  app.kubernetes.io/part-of: opendatahub
+  kustomize.component: opendatahub-project-controller
+  component.opendatahub.io/name: opendatahub-project-controller
+  opendatahub.io/component: "true"
+
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
deleted file mode 100644
index 8e8ce2a..0000000
--- a/config/default/kustomization.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ../rbac
-  - ../manager
-
-# Adds namespace to all resources.
-namespace: odh-project-controller
-
-namePrefix: odh-project-controller-
-
-# Labels to add to all resources and selectors.
-commonLabels:
-  app: odh-project-controller
-  app.kubernetes.io/part-of: odh-project-controller
-  kustomize.component: odh-project-controller
-  component.opendatahub.io/name: odh-project-controller
-  opendatahub.io/component: "true"
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 218c5a5..5d78c95 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -3,6 +3,7 @@ kind: Kustomization
 resources:
 - manager.yaml
 - service.yaml
+
 images:
 - name: controller
   newName: quay.io/maistra-dev/odh-project-controller