diff --git a/basic/apps/stackspout/dev/gitea-oauth-client.yaml b/basic/apps/dev/gitea-oauth-client.yaml
similarity index 100%
rename from basic/apps/stackspout/dev/gitea-oauth-client.yaml
rename to basic/apps/dev/gitea-oauth-client.yaml
diff --git a/basic/apps/stackspout/dev/gitea-release.yaml b/basic/apps/dev/gitea-release.yaml
similarity index 100%
rename from basic/apps/stackspout/dev/gitea-release.yaml
rename to basic/apps/dev/gitea-release.yaml
diff --git a/basic/apps/stackspout/dev/gitea-values-configmap.yaml b/basic/apps/dev/gitea-values-configmap.yaml
similarity index 100%
rename from basic/apps/stackspout/dev/gitea-values-configmap.yaml
rename to basic/apps/dev/gitea-values-configmap.yaml
diff --git a/basic/apps/stackspout/do/vikunja-oauth-client.yaml b/basic/apps/do/vikunja-oauth-client.yaml
similarity index 100%
rename from basic/apps/stackspout/do/vikunja-oauth-client.yaml
rename to basic/apps/do/vikunja-oauth-client.yaml
diff --git a/basic/apps/stackspout/do/vikunja-release.yaml b/basic/apps/do/vikunja-release.yaml
similarity index 100%
rename from basic/apps/stackspout/do/vikunja-release.yaml
rename to basic/apps/do/vikunja-release.yaml
diff --git a/basic/apps/stackspout/do/vikunja-values-configmap.yaml b/basic/apps/do/vikunja-values-configmap.yaml
similarity index 100%
rename from basic/apps/stackspout/do/vikunja-values-configmap.yaml
rename to basic/apps/do/vikunja-values-configmap.yaml
diff --git a/basic/clusters/production/infrastructure-kustomization.yaml b/basic/clusters/production/infrastructure-kustomization.yaml
index 636d772..c6a75b5 100644
--- a/basic/clusters/production/infrastructure-kustomization.yaml
+++ b/basic/clusters/production/infrastructure-kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
 kind: Kustomization
 metadata:
   name: sources
-  namespace: stackspout
+  namespace: flux-system
 spec:
   interval: 5m
   sourceRef:
diff --git a/basic/clusters/production/overrides-kustomization.yaml b/basic/clusters/production/overrides-kustomization.yaml
index 112a99f..f73cb90 100644
--- a/basic/clusters/production/overrides-kustomization.yaml
+++ b/basic/clusters/production/overrides-kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
 kind: Kustomization
 metadata:
-  name: overrides
-  namespace: stackspout
+  name: stackspout-overrides
+  namespace: flux-system
 spec:
   interval: 2m
   sourceRef:
diff --git a/basic/install.sh b/basic/install.sh
index cacec8f..db3690b 100755
--- a/basic/install.sh
+++ b/basic/install.sh
@@ -4,14 +4,12 @@ kubectl get namespace stackspout 2>/dev/null || kubectl create namespace stacksp
 
 echo "Creating / updating gitRepository stackspout in namespace stackspout"
 flux create source git stackspout \
-  --namespace=stackspout \
   --url=https://open.greenhost.net/xeruf/stackspout.git \
   --branch=main \
   --interval=3m
 
 echo "Creating / updating kustomization stackspout in namespace stackspout"
 flux create kustomization stackspout \
-  --namespace=stackspout \
   --source=GitRepository/stackspout \
   --path="./basic/clusters/production/" \
   --prune=true \