diff --git a/basic/clusters/production/namespace-kustomization.yaml b/basic/clusters/production/namespace-kustomization.yaml
new file mode 100644
index 0000000..7332d80
--- /dev/null
+++ b/basic/clusters/production/namespace-kustomization.yaml
@@ -0,0 +1,13 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+kind: Kustomization
+metadata:
+  name: stackspin-namespace
+  namespace: flux-system
+spec:
+  interval: 30m
+  sourceRef:
+    kind: GitRepository
+    name: stackspout
+  path: ./basic/infrastructure/namespaces
+  prune: true
+  validation: client
diff --git a/basic/clusters/production/infrastructure-kustomization.yaml b/basic/clusters/production/sources-kustomization.yaml
similarity index 77%
rename from basic/clusters/production/infrastructure-kustomization.yaml
rename to basic/clusters/production/sources-kustomization.yaml
index 17f7321..a5be1fb 100644
--- a/basic/clusters/production/infrastructure-kustomization.yaml
+++ b/basic/clusters/production/sources-kustomization.yaml
@@ -1,13 +1,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
 kind: Kustomization
 metadata:
-  name: sources
+  name: stackspin-sources
   namespace: flux-system
 spec:
   interval: 30m
   sourceRef:
     kind: GitRepository
     name: stackspout
-  path: ./basic/infrastructure
+  path: ./basic/infrastructure/sources
   prune: true
   validation: client
diff --git a/basic/infrastructure/namespaces/kustomization.yaml b/basic/infrastructure/namespaces/kustomization.yaml
new file mode 100644
index 0000000..cf9152d
--- /dev/null
+++ b/basic/infrastructure/namespaces/kustomization.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - stackspout.yaml
diff --git a/basic/infrastructure/namespaces/stackspout-namespace.yaml b/basic/infrastructure/namespaces/stackspout.yaml
similarity index 100%
rename from basic/infrastructure/namespaces/stackspout-namespace.yaml
rename to basic/infrastructure/namespaces/stackspout.yaml