diff --git a/infra/cert-manager/cert-manager.yaml b/add-ons/cert-manager/cert-manager.yaml
similarity index 100%
rename from infra/cert-manager/cert-manager.yaml
rename to add-ons/cert-manager/cert-manager.yaml
diff --git a/infra/cert-manager/kustomization.yaml b/add-ons/cert-manager/kustomization.yaml
similarity index 100%
rename from infra/cert-manager/kustomization.yaml
rename to add-ons/cert-manager/kustomization.yaml
diff --git a/infra/cert-manager/letsencrypt-issuer.yaml b/add-ons/cert-manager/letsencrypt-issuer.yaml
similarity index 100%
rename from infra/cert-manager/letsencrypt-issuer.yaml
rename to add-ons/cert-manager/letsencrypt-issuer.yaml
diff --git a/infra/sealed-secrets/kustomization.yaml b/add-ons/sealed-secrets/kustomization.yaml
similarity index 99%
rename from infra/sealed-secrets/kustomization.yaml
rename to add-ons/sealed-secrets/kustomization.yaml
index ab93798..fe3a937 100644
--- a/infra/sealed-secrets/kustomization.yaml
+++ b/add-ons/sealed-secrets/kustomization.yaml
@@ -3,4 +3,3 @@ kind: Kustomization
 
 resources:
   - https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.33.1/controller.yaml
-
diff --git a/apps/cert-manager.yaml b/applications/add-ons/app-cert-manager.yaml
similarity index 91%
rename from apps/cert-manager.yaml
rename to applications/add-ons/app-cert-manager.yaml
index 80dd635..18a9bcc 100644
--- a/apps/cert-manager.yaml
+++ b/applications/add-ons/app-cert-manager.yaml
@@ -8,7 +8,7 @@ spec:
   source:
     repoURL: https://gitea.whyredfire.tech/whyredfire/gitops
     targetRevision: main
-    path: infra/cert-manager
+    path: add-ons/cert-manager
   destination:
     server: https://kubernetes.default.svc
   syncPolicy:
diff --git a/apps/sealed-secrets.yaml b/applications/add-ons/app-sealed-secrets.yaml
similarity index 91%
rename from apps/sealed-secrets.yaml
rename to applications/add-ons/app-sealed-secrets.yaml
index 42de2f6..aa9d80d 100644
--- a/apps/sealed-secrets.yaml
+++ b/applications/add-ons/app-sealed-secrets.yaml
@@ -8,7 +8,7 @@ spec:
   source:
     repoURL: https://gitea.whyredfire.tech/whyredfire/gitops
     targetRevision: main
-    path: infra/sealed-secrets
+    path: add-ons/sealed-secrets
   destination:
     server: https://kubernetes.default.svc
   syncPolicy:
diff --git a/applications/add-ons/kustomization.yaml b/applications/add-ons/kustomization.yaml
new file mode 100644
index 0000000..74589bd
--- /dev/null
+++ b/applications/add-ons/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - app-sealed-secrets.yaml
+  - app-cert-manager.yaml
diff --git a/applications/kustomization.yaml b/applications/kustomization.yaml
new file mode 100644
index 0000000..2cb8e69
--- /dev/null
+++ b/applications/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - add-ons
+  - services
diff --git a/apps/telegram-autoregexbot.yaml b/applications/services/app-autoregexbot.yaml
similarity index 100%
rename from apps/telegram-autoregexbot.yaml
rename to applications/services/app-autoregexbot.yaml
diff --git a/apps/betterslcm.yaml b/applications/services/app-betterslcm.yaml
similarity index 100%
rename from apps/betterslcm.yaml
rename to applications/services/app-betterslcm.yaml
diff --git a/apps/scriptscribe.yaml b/applications/services/app-scriptscribe.yaml
similarity index 100%
rename from apps/scriptscribe.yaml
rename to applications/services/app-scriptscribe.yaml
diff --git a/applications/services/kustomization.yaml b/applications/services/kustomization.yaml
new file mode 100644
index 0000000..7e4c649
--- /dev/null
+++ b/applications/services/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - app-scriptscribe.yaml
+  - app-autoregexbot.yaml
+  - app-betterslcm.yaml
diff --git a/apps/kustomization.yaml b/apps/kustomization.yaml
deleted file mode 100644
index b3d13ee..0000000
--- a/apps/kustomization.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - scriptscribe.yaml
-  - sealed-secrets.yaml
-  - cert-manager.yaml
-  - telegram-autoregexbot.yaml
-  - betterslcm.yaml
diff --git a/bootstrap/argocd/kustomization.yaml b/bootstrap/argocd/kustomization.yaml
index 2d378ef..5ce5b17 100644
--- a/bootstrap/argocd/kustomization.yaml
+++ b/bootstrap/argocd/kustomization.yaml
@@ -2,6 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - namespace.yaml
   - root-app.yaml
   - ssh-known-hosts-cm.yaml
diff --git a/bootstrap/argocd/namespace.yaml b/bootstrap/argocd/namespace.yaml
deleted file mode 100644
index a040f2b..0000000
--- a/bootstrap/argocd/namespace.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: argocd
diff --git a/bootstrap/argocd/root-app.yaml b/bootstrap/argocd/root-app.yaml
index b9c5476..2db7bd4 100644
--- a/bootstrap/argocd/root-app.yaml
+++ b/bootstrap/argocd/root-app.yaml
@@ -8,7 +8,7 @@ spec:
   source:
     repoURL: https://gitea.whyredfire.tech/whyredfire/gitops
     targetRevision: main
-    path: apps
+    path: applications
   destination:
     server: https://kubernetes.default.svc
     namespace: argocd
@@ -16,3 +16,5 @@ spec:
     automated:
       prune: true
       selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/bootstrap/argocd/ssh-known-hosts-cm.yaml b/bootstrap/argocd/ssh-known-hosts-cm.yaml
index a8848e2..9169f4d 100644
--- a/bootstrap/argocd/ssh-known-hosts-cm.yaml
+++ b/bootstrap/argocd/ssh-known-hosts-cm.yaml
@@ -13,4 +13,3 @@ data:
     gitea-ssh.whyredfire.tech ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDLoFqTU09bU6ONUr9XvJT8G3zfwOviHw+ZM1EwPWVL5HEotYssWEjyteZGws5I0mXIuNJljL0BY1QSPoJaeAU8=
     # gitea-ssh.whyredfire.tech:22 SSH-2.0-OpenSSH_10.0
     # gitea-ssh.whyredfire.tech:22 SSH-2.0-OpenSSH_10.0
-