diff --git a/Bootstrap.md b/Bootstrap.md
index 8a6abda..16ea7db 100644
--- a/Bootstrap.md
+++ b/Bootstrap.md
@@ -1,16 +1,17 @@
 
+create namespaces
+
+$ kubectl --context=gullfaxi apply -R apps/namespaces
 
 install nginx-ingress
 
 $ helm dep update apps/system/nginx-ingress
-$ kubectl --context=gullfaxi create ns nginx-ingress
 $ helm template --name nginx-ingress --namespace nginx-ingress apps/system/nginx-ingress | kubectl --context=gullfaxi --namespace nginx-ingress apply -f -
 
 install cert-manager with cluster issuer
 
 $ helm repo add jetstack https://charts.jetstack.io
 $ helm dep update apps/system/cert-manager
-$ kubectl --context=gullfaxi create ns cert-manager
 $ helm template --name cert-manager --namespace cert-manager apps/system/cert-manager | kubectl --context=gullfaxi --namespace cert-manager apply -f -
 
 install argocd
diff --git a/apps/argocd/namespace.yaml b/apps/namespaces/argocd.yaml
similarity index 50%
rename from apps/argocd/namespace.yaml
rename to apps/namespaces/argocd.yaml
index 6dfed4a..a040f2b 100644
--- a/apps/argocd/namespace.yaml
+++ b/apps/namespaces/argocd.yaml
@@ -2,5 +2,3 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
diff --git a/apps/system/cert-manager/templates/namespace.yaml b/apps/namespaces/cert-manager.yaml
similarity index 53%
rename from apps/system/cert-manager/templates/namespace.yaml
rename to apps/namespaces/cert-manager.yaml
index 754d6c3..c90416f 100644
--- a/apps/system/cert-manager/templates/namespace.yaml
+++ b/apps/namespaces/cert-manager.yaml
@@ -2,5 +2,3 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: cert-manager
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
diff --git a/apps/system/nginx-ingress/templates/namespace.yaml b/apps/namespaces/nginx-ingress.yaml
similarity index 53%
rename from apps/system/nginx-ingress/templates/namespace.yaml
rename to apps/namespaces/nginx-ingress.yaml
index 3292648..4b60fec 100644
--- a/apps/system/nginx-ingress/templates/namespace.yaml
+++ b/apps/namespaces/nginx-ingress.yaml
@@ -2,5 +2,3 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: nginx-ingress
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
diff --git a/apps/system/oauth2-proxy/templates/namespace.yaml b/apps/namespaces/oauth2-proxy.yaml
similarity index 53%
rename from apps/system/oauth2-proxy/templates/namespace.yaml
rename to apps/namespaces/oauth2-proxy.yaml
index e42b667..ded8ae8 100644
--- a/apps/system/oauth2-proxy/templates/namespace.yaml
+++ b/apps/namespaces/oauth2-proxy.yaml
@@ -2,5 +2,3 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: oauth2-proxy
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
diff --git a/apps/system/prometheus-operator/templates/namespace.yaml b/apps/namespaces/prometheus-operator.yaml
similarity index 56%
rename from apps/system/prometheus-operator/templates/namespace.yaml
rename to apps/namespaces/prometheus-operator.yaml
index 8c675c6..a586749 100644
--- a/apps/system/prometheus-operator/templates/namespace.yaml
+++ b/apps/namespaces/prometheus-operator.yaml
@@ -2,5 +2,3 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: prometheus-operator
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
diff --git a/apps/system/sealed-secrets/namespace.yaml b/apps/system/sealed-secrets/namespace.yaml
index 9d2c6a8..f105649 100644
--- a/apps/system/sealed-secrets/namespace.yaml
+++ b/apps/system/sealed-secrets/namespace.yaml
@@ -2,5 +2,3 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: sealedsecrets
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
diff --git a/main/templates/namespaces.yaml b/main/templates/namespaces.yaml
new file mode 100644
index 0000000..b554f05
--- /dev/null
+++ b/main/templates/namespaces.yaml
@@ -0,0 +1,19 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: namespaces
+  namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: default
+    server: https://kubernetes.default.svc 
+  project: default
+  source:
+    path: apps/namespaces
+    repoURL: git@github.com:gorilych/gf-k8s
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true