diff --git a/clusters/staging/apps/kustomization.yaml b/clusters/staging/apps/kustomization.yaml
index a4c84da..a5ffe02 100644
--- a/clusters/staging/apps/kustomization.yaml
+++ b/clusters/staging/apps/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../../apps
+  - ../../../deploy/apps
 patches:
   - path: podinfo-values.yaml
     target:
diff --git a/clusters/staging/infrastructure/configs/kustomization.yaml b/clusters/staging/infra-configs/kustomization.yaml
similarity index 65%
rename from clusters/staging/infrastructure/configs/kustomization.yaml
rename to clusters/staging/infra-configs/kustomization.yaml
index cf852c2..9762e98 100644
--- a/clusters/staging/infrastructure/configs/kustomization.yaml
+++ b/clusters/staging/infra-configs/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../../../infrastructure/configs
+  - ../../../deploy/infra-configs
diff --git a/clusters/staging/infrastructure/controllers/kustomization.yaml b/clusters/staging/infra-controllers/kustomization.yaml
similarity index 63%
rename from clusters/staging/infrastructure/controllers/kustomization.yaml
rename to clusters/staging/infra-controllers/kustomization.yaml
index 794fb08..cb95b5d 100644
--- a/clusters/staging/infrastructure/controllers/kustomization.yaml
+++ b/clusters/staging/infra-controllers/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../../../infrastructure/controllers
+  - ../../../deploy/infra-controllers
diff --git a/clusters/staging/tenants/kustomization.yaml b/clusters/staging/tenants/kustomization.yaml
new file mode 100644
index 0000000..d59125c
--- /dev/null
+++ b/clusters/staging/tenants/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../deploy/tenants
diff --git a/apps/kustomization.yaml b/deploy/apps/kustomization.yaml
similarity index 100%
rename from apps/kustomization.yaml
rename to deploy/apps/kustomization.yaml
diff --git a/apps/podinfo.yaml b/deploy/apps/podinfo.yaml
similarity index 100%
rename from apps/podinfo.yaml
rename to deploy/apps/podinfo.yaml
diff --git a/infrastructure/configs/cluster-issuers.yaml b/deploy/infra-configs/cluster-issuers.yaml
similarity index 100%
rename from infrastructure/configs/cluster-issuers.yaml
rename to deploy/infra-configs/cluster-issuers.yaml
diff --git a/infrastructure/configs/kustomization.yaml b/deploy/infra-configs/kustomization.yaml
similarity index 100%
rename from infrastructure/configs/kustomization.yaml
rename to deploy/infra-configs/kustomization.yaml
diff --git a/infrastructure/controllers/cert-manager.yaml b/deploy/infra-controllers/cert-manager.yaml
similarity index 100%
rename from infrastructure/controllers/cert-manager.yaml
rename to deploy/infra-controllers/cert-manager.yaml
diff --git a/infrastructure/controllers/ingress-nginx.yaml b/deploy/infra-controllers/ingress-nginx.yaml
similarity index 100%
rename from infrastructure/controllers/ingress-nginx.yaml
rename to deploy/infra-controllers/ingress-nginx.yaml
diff --git a/infrastructure/controllers/kustomization.yaml b/deploy/infra-controllers/kustomization.yaml
similarity index 100%
rename from infrastructure/controllers/kustomization.yaml
rename to deploy/infra-controllers/kustomization.yaml
diff --git a/clusters/staging/tenants/cert-manager.yaml b/deploy/tenants/cert-manager.yaml
similarity index 100%
rename from clusters/staging/tenants/cert-manager.yaml
rename to deploy/tenants/cert-manager.yaml
diff --git a/clusters/staging/tenants/flux.yaml b/deploy/tenants/flux.yaml
similarity index 63%
rename from clusters/staging/tenants/flux.yaml
rename to deploy/tenants/flux.yaml
index 40287fd..adab3ba 100644
--- a/clusters/staging/tenants/flux.yaml
+++ b/deploy/tenants/flux.yaml
@@ -1,31 +1,31 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: staging
+  name: "${CLUSTER_NAME}"
   labels:
-    toolkit.fluxcd.io/tenant: admin-team
+    toolkit.fluxcd.io/tenant: sre-team
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    toolkit.fluxcd.io/tenant: admin-team
+    toolkit.fluxcd.io/tenant: sre-team
   name: flux-restricted
-  namespace: staging
+  namespace: "${CLUSTER_NAME}"
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    toolkit.fluxcd.io/tenant: admin-team
+    toolkit.fluxcd.io/tenant: sre-team
   name: flux-cluster-admin
-  namespace: staging
+  namespace: "${CLUSTER_NAME}"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    toolkit.fluxcd.io/tenant: admin-team
+    toolkit.fluxcd.io/tenant: sre-team
   name: flux-cluster-admin
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -34,4 +34,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: flux-cluster-admin
-    namespace: staging
+    namespace: "${CLUSTER_NAME}"
diff --git a/clusters/staging/tenants/ingress-nginx.yaml b/deploy/tenants/ingress-nginx.yaml
similarity index 100%
rename from clusters/staging/tenants/ingress-nginx.yaml
rename to deploy/tenants/ingress-nginx.yaml
diff --git a/deploy/tenants/kustomization.yaml b/deploy/tenants/kustomization.yaml
new file mode 100644
index 0000000..3aa3e2a
--- /dev/null
+++ b/deploy/tenants/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - flux.yaml
+  - cert-manager.yaml
+  - ingress-nginx.yaml
+  - podinfo.yaml
diff --git a/clusters/staging/tenants/podinfo.yaml b/deploy/tenants/podinfo.yaml
similarity index 94%
rename from clusters/staging/tenants/podinfo.yaml
rename to deploy/tenants/podinfo.yaml
index cd61502..28a6e88 100644
--- a/clusters/staging/tenants/podinfo.yaml
+++ b/deploy/tenants/podinfo.yaml
@@ -21,4 +21,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: flux-restricted
-    namespace: staging
+    namespace: "${CLUSTER_NAME}"
diff --git a/hub/staging.yaml b/hub/staging.yaml
index 9c10c10..83eb9eb 100644
--- a/hub/staging.yaml
+++ b/hub/staging.yaml
@@ -6,7 +6,7 @@ metadata:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: tenants-sync
+  name: tenants
   namespace: staging
 spec:
   interval: 1h
@@ -22,22 +22,25 @@ spec:
   kubeConfig:
     secretRef:
       name: cluster-kubeconfig
+  postBuild:
+    substitute:
+      CLUSTER_NAME: staging
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: infra-controllers-sync
+  name: infra-controllers
   namespace: staging
 spec:
   dependsOn:
-    - name: tenants-sync
+    - name: tenants
   targetNamespace: staging
   interval: 1h
   retryInterval: 3m
   timeout: 5m
   prune: true
   wait: true
-  path: ./clusters/staging/infrastructure/controllers
+  path: ./clusters/staging/infra-controllers
   sourceRef:
     kind: GitRepository
     name: flux-system
@@ -58,18 +61,18 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: infra-configs-sync
+  name: infra-configs
   namespace: staging
 spec:
   dependsOn:
-    - name: infra-controllers-sync
+    - name: infra-controllers
   targetNamespace: staging
   interval: 1h
   retryInterval: 3m
   timeout: 5m
   prune: true
   wait: true
-  path: ./clusters/staging/infrastructure/configs
+  path: ./clusters/staging/infra-configs
   sourceRef:
     kind: GitRepository
     name: flux-system
@@ -81,11 +84,11 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: apps-sync
+  name: apps
   namespace: staging
 spec:
   dependsOn:
-    - name: infra-configs-sync
+    - name: infra-configs
   targetNamespace: staging
   interval: 1h
   retryInterval: 3m