diff --git a/apps/kustomization.yaml b/apps/kustomization.yaml
index a21325c57..d41530883 100644
--- a/apps/kustomization.yaml
+++ b/apps/kustomization.yaml
@@ -3,4 +3,4 @@ kind: Kustomization
 resources:
 - appsets/project-understack-infra.yaml
 - appsets/project-understack-operators.yaml
-- appsets/project-understack.yaml
+- ../bootstrap/argocd-understack/appproject-understack.yaml
diff --git a/charts/argocd-understack/templates/application-cert-manager.yaml b/charts/argocd-understack/templates/application-cert-manager.yaml
index c1e63d755..024b41d17 100644
--- a/charts/argocd-understack/templates/application-cert-manager.yaml
+++ b/charts/argocd-understack/templates/application-cert-manager.yaml
@@ -18,7 +18,7 @@ spec:
   destination:
     namespace: cert-manager
     server: {{ $.Values.cluster_server }}
-  project: understack-infra
+  project: understack
   sources:
   {{- if $installApp }}
   - chart: cert-manager
diff --git a/charts/argocd-understack/templates/application-cilium.yaml b/charts/argocd-understack/templates/application-cilium.yaml
index b5b7981f2..5e13787c1 100644
--- a/charts/argocd-understack/templates/application-cilium.yaml
+++ b/charts/argocd-understack/templates/application-cilium.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: cilium
     server: {{ $.Values.cluster_server }}
-  project: understack-infra
+  project: understack
   sources:
   - path: {{ include "understack.deploy_path" $ }}/cilium
     ref: deploy
diff --git a/charts/argocd-understack/templates/application-cnpg-system.yaml b/charts/argocd-understack/templates/application-cnpg-system.yaml
index 81e722a38..e9608cc64 100644
--- a/charts/argocd-understack/templates/application-cnpg-system.yaml
+++ b/charts/argocd-understack/templates/application-cnpg-system.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: cnpg-system
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   sources:
   - path: operators/cnpg-system
     ref: understack
diff --git a/charts/argocd-understack/templates/application-envoy-gateway.yaml b/charts/argocd-understack/templates/application-envoy-gateway.yaml
index 4a33b4fc4..045f2a893 100644
--- a/charts/argocd-understack/templates/application-envoy-gateway.yaml
+++ b/charts/argocd-understack/templates/application-envoy-gateway.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: envoy-gateway
     server: {{ $.Values.cluster_server }}
-  project: understack-infra
+  project: understack
   sources:
   - chart: gateway-helm
     helm:
diff --git a/charts/argocd-understack/templates/application-etcdbackup.yaml b/charts/argocd-understack/templates/application-etcdbackup.yaml
index ea40d1ff7..e435d21df 100644
--- a/charts/argocd-understack/templates/application-etcdbackup.yaml
+++ b/charts/argocd-understack/templates/application-etcdbackup.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: kube-system
     server: {{ $.Values.cluster_server }}
-  project: understack-infra
+  project: understack
   sources:
   - helm:
       ignoreMissingValueFiles: true
diff --git a/charts/argocd-understack/templates/application-external-dns.yaml b/charts/argocd-understack/templates/application-external-dns.yaml
index 66bfda3d0..6d3cc25b8 100644
--- a/charts/argocd-understack/templates/application-external-dns.yaml
+++ b/charts/argocd-understack/templates/application-external-dns.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: external-dns
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   sources:
   - chart: external-dns-rackspace
     helm:
diff --git a/charts/argocd-understack/templates/application-external-secrets.yaml b/charts/argocd-understack/templates/application-external-secrets.yaml
index f5addc284..ca597a0e0 100644
--- a/charts/argocd-understack/templates/application-external-secrets.yaml
+++ b/charts/argocd-understack/templates/application-external-secrets.yaml
@@ -15,7 +15,7 @@ spec:
   destination:
     namespace: external-secrets
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   sources:
   {{- if $installApp }}
   - path: operators/external-secrets
diff --git a/charts/argocd-understack/templates/application-ingress-nginx.yaml b/charts/argocd-understack/templates/application-ingress-nginx.yaml
index e03ec7a59..ef0c320a6 100644
--- a/charts/argocd-understack/templates/application-ingress-nginx.yaml
+++ b/charts/argocd-understack/templates/application-ingress-nginx.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: ingress-nginx
     server: {{ $.Values.cluster_server }}
-  project: understack-infra
+  project: understack
   sources:
   - chart: ingress-nginx
     helm:
diff --git a/charts/argocd-understack/templates/application-mariadb-operator-crds.yaml b/charts/argocd-understack/templates/application-mariadb-operator-crds.yaml
index 29bea3893..dffad1f1c 100644
--- a/charts/argocd-understack/templates/application-mariadb-operator-crds.yaml
+++ b/charts/argocd-understack/templates/application-mariadb-operator-crds.yaml
@@ -15,7 +15,7 @@ spec:
   destination:
     namespace: mariadb-operator
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   source:
     repoURL: https://mariadb-operator.github.io/mariadb-operator
     chart: mariadb-operator-crds
diff --git a/charts/argocd-understack/templates/application-mariadb-operator.yaml b/charts/argocd-understack/templates/application-mariadb-operator.yaml
index 378266a04..85928d89e 100644
--- a/charts/argocd-understack/templates/application-mariadb-operator.yaml
+++ b/charts/argocd-understack/templates/application-mariadb-operator.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: mariadb-operator
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   sources:
   - path: operators/mariadb-operator
     ref: understack
diff --git a/charts/argocd-understack/templates/application-monitoring.yaml b/charts/argocd-understack/templates/application-monitoring.yaml
index 3dae13af9..13975cee2 100644
--- a/charts/argocd-understack/templates/application-monitoring.yaml
+++ b/charts/argocd-understack/templates/application-monitoring.yaml
@@ -11,7 +11,7 @@ spec:
   destination:
     namespace: monitoring
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   sources:
   - chart: kube-prometheus-stack
     helm:
diff --git a/charts/argocd-understack/templates/application-openebs.yaml b/charts/argocd-understack/templates/application-openebs.yaml
index 47aaef3f9..ba3bf2c3f 100644
--- a/charts/argocd-understack/templates/application-openebs.yaml
+++ b/charts/argocd-understack/templates/application-openebs.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: openebs
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   sources:
   - chart: openebs
     helm:
diff --git a/charts/argocd-understack/templates/application-openstack-resource-controller.yaml b/charts/argocd-understack/templates/application-openstack-resource-controller.yaml
index 324fb8749..3e36cbf96 100644
--- a/charts/argocd-understack/templates/application-openstack-resource-controller.yaml
+++ b/charts/argocd-understack/templates/application-openstack-resource-controller.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: orc-system
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   sources:
   - path: operators/openstack-resource-controller
     ref: understack
diff --git a/charts/argocd-understack/templates/application-opentelemetry-operator.yaml b/charts/argocd-understack/templates/application-opentelemetry-operator.yaml
index 78e215d0f..1b15d0d6d 100644
--- a/charts/argocd-understack/templates/application-opentelemetry-operator.yaml
+++ b/charts/argocd-understack/templates/application-opentelemetry-operator.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: opentelemetry-operator
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   sources:
   - chart: opentelemetry-operator
     helm:
diff --git a/charts/argocd-understack/templates/application-prometheus-operator-crds.yaml b/charts/argocd-understack/templates/application-prometheus-operator-crds.yaml
index 2b988caad..a016c6ec3 100644
--- a/charts/argocd-understack/templates/application-prometheus-operator-crds.yaml
+++ b/charts/argocd-understack/templates/application-prometheus-operator-crds.yaml
@@ -15,7 +15,7 @@ spec:
   destination:
     namespace: monitoring
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   source:
     repoURL: https://prometheus-community.github.io/helm-charts
     chart: prometheus-operator-crds
diff --git a/charts/argocd-understack/templates/application-rabbitmq-system.yaml b/charts/argocd-understack/templates/application-rabbitmq-system.yaml
index f37e9d998..f18bc06b8 100644
--- a/charts/argocd-understack/templates/application-rabbitmq-system.yaml
+++ b/charts/argocd-understack/templates/application-rabbitmq-system.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: rabbitmq-system
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   sources:
   - path: operators/rabbitmq-system
     ref: understack
diff --git a/charts/argocd-understack/templates/application-rook-ceph-cluster.yaml b/charts/argocd-understack/templates/application-rook-ceph-cluster.yaml
index dc857b39a..31450fcfd 100644
--- a/charts/argocd-understack/templates/application-rook-ceph-cluster.yaml
+++ b/charts/argocd-understack/templates/application-rook-ceph-cluster.yaml
@@ -16,7 +16,7 @@ spec:
   destination:
     namespace: rook-ceph
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   sources:
   {{- if $installApp }}
   - chart: rook-ceph-cluster
diff --git a/charts/argocd-understack/templates/application-rook-ceph-operator.yaml b/charts/argocd-understack/templates/application-rook-ceph-operator.yaml
index 1c4aac9b0..45cb026b1 100644
--- a/charts/argocd-understack/templates/application-rook-ceph-operator.yaml
+++ b/charts/argocd-understack/templates/application-rook-ceph-operator.yaml
@@ -16,7 +16,7 @@ spec:
   destination:
     namespace: rook-ceph
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   sources:
   {{- if $installApp }}
   - chart: rook-ceph
diff --git a/charts/argocd-understack/templates/application-rook.yaml b/charts/argocd-understack/templates/application-rook.yaml
index e8efef5e3..2ebe02595 100644
--- a/charts/argocd-understack/templates/application-rook.yaml
+++ b/charts/argocd-understack/templates/application-rook.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: rook-ceph
     server: {{ $.Values.cluster_server }}
-  project: understack-operators
+  project: understack
   sources:
   - chart: rook-ceph
     helm:
diff --git a/charts/argocd-understack/templates/application-sealed-secrets.yaml b/charts/argocd-understack/templates/application-sealed-secrets.yaml
index d426a304a..6638c98f5 100644
--- a/charts/argocd-understack/templates/application-sealed-secrets.yaml
+++ b/charts/argocd-understack/templates/application-sealed-secrets.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: kube-system
     server: {{ $.Values.cluster_server }}
-  project: understack-infra
+  project: understack
   sources:
   - path: bootstrap/sealed-secrets
     ref: understack