diff --git a/share/organisation/stages.tf b/share/organisation/stages.tf
index b46cf9f..f4a6659 100644
--- a/share/organisation/stages.tf
+++ b/share/organisation/stages.tf
@@ -83,7 +83,7 @@ resource "kubectl_manifest" "ci-git-repo" {
     kind: GitRepository
     metadata:
       name: "deploy-git"
-      namespace: "${var.namespace}"
+      namespace: "${local.sorted-stages[count.index].namespace}"
       labels: ${jsonencode(local.push-labels)}
     spec:
       interval: 5m0s
@@ -102,11 +102,11 @@ resource "kubectl_manifest" "ci-kustomization" {
     kind: Kustomization
     metadata:
       name: "${var.instance}-${var.component}-deploy"
-      namespace: "${var.namespace}"
+      namespace: "${local.sorted-stages[count.index].namespace}"
       labels: ${jsonencode(local.push-labels)}
     spec:
       interval: 5m
-      path: ./ci
+      path: ./stages/${local.sorted-stages[count.index].name}/deploy
       prune: true
       targetNamespace: "${var.namespace}"
       sourceRef: