diff --git a/argocd/app-of-apps/test/templates/namespaces.yaml b/argocd/app-of-apps/test/templates/namespaces.yaml
index 5086d3b..64e6619 100644
--- a/argocd/app-of-apps/test/templates/namespaces.yaml
+++ b/argocd/app-of-apps/test/templates/namespaces.yaml
@@ -1,7 +1,9 @@
 {{- range .Values.applications }}
+{{- if .createNamespace }}
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ .namespace }}
 {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/argocd/app-of-apps/test/values.yaml b/argocd/app-of-apps/test/values.yaml
index 1703d70..d85a2db 100644
--- a/argocd/app-of-apps/test/values.yaml
+++ b/argocd/app-of-apps/test/values.yaml
@@ -3,22 +3,27 @@ applications:
     project: default
     targetRevision: main
     namespace: spring-support
+    createNamespace: true
   - name: kafka
     project: default
     targetRevision: main
     namespace: kafka
+    createNamespace: true
   - name: zookeeper
     project: default
     targetRevision: main
     namespace: kafka
+    createNamespace: false
   - name: wahlrecht
     project: default
     targetRevision: main
     namespace: wahlrecht
+    createNamespace: true
   - name: vault-secrets-operator
     project: default
     targetRevision: main
     namespace: vault-secrets-operator-system
+    createNamespace: true
 
 overall:
   destinationServer: https://kubernetes.default.svc