diff --git a/infra/argocd-dashboard/httproute.yaml b/add-ons/argocd-dashboard/httproute.yaml
similarity index 100%
rename from infra/argocd-dashboard/httproute.yaml
rename to add-ons/argocd-dashboard/httproute.yaml
diff --git a/infra/argocd-dashboard/kustomization.yaml b/add-ons/argocd-dashboard/kustomization.yaml
similarity index 100%
rename from infra/argocd-dashboard/kustomization.yaml
rename to add-ons/argocd-dashboard/kustomization.yaml
diff --git a/infra/argocd-dashboard/oidc-sealedsecret.yaml b/add-ons/argocd-dashboard/oidc-sealedsecret.yaml
similarity index 100%
rename from infra/argocd-dashboard/oidc-sealedsecret.yaml
rename to add-ons/argocd-dashboard/oidc-sealedsecret.yaml
diff --git a/infra/authentik/blueprints.yaml b/add-ons/authentik/blueprints.yaml
similarity index 100%
rename from infra/authentik/blueprints.yaml
rename to add-ons/authentik/blueprints.yaml
diff --git a/infra/authentik/httproute.yaml b/add-ons/authentik/httproute.yaml
similarity index 100%
rename from infra/authentik/httproute.yaml
rename to add-ons/authentik/httproute.yaml
diff --git a/infra/authentik/kustomization.yaml b/add-ons/authentik/kustomization.yaml
similarity index 100%
rename from infra/authentik/kustomization.yaml
rename to add-ons/authentik/kustomization.yaml
diff --git a/infra/authentik/referencegrant.yaml b/add-ons/authentik/referencegrant.yaml
similarity index 100%
rename from infra/authentik/referencegrant.yaml
rename to add-ons/authentik/referencegrant.yaml
diff --git a/infra/authentik/sealed-secret.yaml b/add-ons/authentik/sealed-secret.yaml
similarity index 100%
rename from infra/authentik/sealed-secret.yaml
rename to add-ons/authentik/sealed-secret.yaml
diff --git a/infra/cert-manager/cloudflare-api-token-sealed-secret.yaml b/add-ons/cert-manager/cloudflare-api-token-sealed-secret.yaml
similarity index 100%
rename from infra/cert-manager/cloudflare-api-token-sealed-secret.yaml
rename to add-ons/cert-manager/cloudflare-api-token-sealed-secret.yaml
diff --git a/infra/cert-manager/cluster-issuer.yaml b/add-ons/cert-manager/cluster-issuer.yaml
similarity index 100%
rename from infra/cert-manager/cluster-issuer.yaml
rename to add-ons/cert-manager/cluster-issuer.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/postgres/authentik-database.yaml b/add-ons/postgres/authentik-database.yaml
similarity index 100%
rename from infra/postgres/authentik-database.yaml
rename to add-ons/postgres/authentik-database.yaml
diff --git a/infra/postgres/authentik-db-sealedsecret.yaml b/add-ons/postgres/authentik-db-sealedsecret.yaml
similarity index 100%
rename from infra/postgres/authentik-db-sealedsecret.yaml
rename to add-ons/postgres/authentik-db-sealedsecret.yaml
diff --git a/infra/postgres/cluster.yaml b/add-ons/postgres/cluster.yaml
similarity index 100%
rename from infra/postgres/cluster.yaml
rename to add-ons/postgres/cluster.yaml
diff --git a/infra/postgres/kustomization.yaml b/add-ons/postgres/kustomization.yaml
similarity index 100%
rename from infra/postgres/kustomization.yaml
rename to add-ons/postgres/kustomization.yaml
diff --git a/infra/traefik/kustomization.yaml b/add-ons/traefik/kustomization.yaml
similarity index 100%
rename from infra/traefik/kustomization.yaml
rename to add-ons/traefik/kustomization.yaml
diff --git a/infra/traefik/wildcard-whyredfire-dev.yaml b/add-ons/traefik/wildcard-whyredfire-dev.yaml
similarity index 100%
rename from infra/traefik/wildcard-whyredfire-dev.yaml
rename to add-ons/traefik/wildcard-whyredfire-dev.yaml
diff --git a/infra/traefik/wildcard-whyredfire-dpdns-org.yaml b/add-ons/traefik/wildcard-whyredfire-dpdns-org.yaml
similarity index 100%
rename from infra/traefik/wildcard-whyredfire-dpdns-org.yaml
rename to add-ons/traefik/wildcard-whyredfire-dpdns-org.yaml
diff --git a/argocd-apps/add-ons/argocd-dashboard.yaml b/argocd-apps/add-ons/argocd-dashboard.yaml
index 8782608..389c532 100644
--- a/argocd-apps/add-ons/argocd-dashboard.yaml
+++ b/argocd-apps/add-ons/argocd-dashboard.yaml
@@ -11,7 +11,7 @@ spec:
     server: https://kubernetes.default.svc
   project: default
   source:
-    path: infra/argocd-dashboard
+    path: add-ons/argocd-dashboard
     repoURL: https://gitea.whyredfire.dev/whyredfire/gitops.git
     targetRevision: main
   syncPolicy:
diff --git a/argocd-apps/add-ons/authentik.yaml b/argocd-apps/add-ons/authentik.yaml
index 2cf07e8..1d9b0fc 100644
--- a/argocd-apps/add-ons/authentik.yaml
+++ b/argocd-apps/add-ons/authentik.yaml
@@ -44,7 +44,7 @@ spec:
                 memory: 384Mi
       repoURL: https://charts.goauthentik.io
       targetRevision: 2026.8.3
-    - path: infra/authentik
+    - path: add-ons/authentik
       repoURL: https://gitea.whyredfire.dev/whyredfire/gitops.git
       targetRevision: main
   syncPolicy:
diff --git a/argocd-apps/add-ons/cert-manager.yaml b/argocd-apps/add-ons/cert-manager.yaml
index e52536f..f1e2cec 100644
--- a/argocd-apps/add-ons/cert-manager.yaml
+++ b/argocd-apps/add-ons/cert-manager.yaml
@@ -23,7 +23,7 @@ spec:
               ExperimentalGatewayAPISupport: true
       repoURL: https://charts.jetstack.io
       targetRevision: v1.21.1
-    - path: infra/cert-manager
+    - path: add-ons/cert-manager
       repoURL: https://gitea.whyredfire.dev/whyredfire/gitops.git
       targetRevision: main
   syncPolicy:
diff --git a/argocd-apps/add-ons/postgres.yaml b/argocd-apps/add-ons/postgres.yaml
index e5176b6..0cab993 100644
--- a/argocd-apps/add-ons/postgres.yaml
+++ b/argocd-apps/add-ons/postgres.yaml
@@ -11,7 +11,7 @@ spec:
     server: https://kubernetes.default.svc
   project: default
   source:
-    path: infra/postgres
+    path: add-ons/postgres
     repoURL: https://gitea.whyredfire.dev/whyredfire/gitops.git
     targetRevision: main
   syncPolicy:
diff --git a/argocd-apps/add-ons/traefik.yaml b/argocd-apps/add-ons/traefik.yaml
index b0ae42a..d757b02 100644
--- a/argocd-apps/add-ons/traefik.yaml
+++ b/argocd-apps/add-ons/traefik.yaml
@@ -55,7 +55,7 @@ spec:
                     group: ""
       repoURL: https://traefik.github.io/charts
       targetRevision: 41.6.0
-    - path: infra/traefik
+    - path: add-ons/traefik
       repoURL: https://gitea.whyredfire.dev/whyredfire/gitops.git
       targetRevision: main
   syncPolicy:
diff --git a/argocd-apps/services/autoregexbot.yaml b/argocd-apps/apps/autoregexbot.yaml
similarity index 100%
rename from argocd-apps/services/autoregexbot.yaml
rename to argocd-apps/apps/autoregexbot.yaml
diff --git a/argocd-apps/services/bentopdf.yaml b/argocd-apps/apps/bentopdf.yaml
similarity index 100%
rename from argocd-apps/services/bentopdf.yaml
rename to argocd-apps/apps/bentopdf.yaml
diff --git a/argocd-apps/services/betterslcm.yaml b/argocd-apps/apps/betterslcm.yaml
similarity index 100%
rename from argocd-apps/services/betterslcm.yaml
rename to argocd-apps/apps/betterslcm.yaml
diff --git a/argocd-apps/services/garage-ui.yaml b/argocd-apps/apps/garage-ui.yaml
similarity index 100%
rename from argocd-apps/services/garage-ui.yaml
rename to argocd-apps/apps/garage-ui.yaml
diff --git a/argocd-apps/services/garage.yaml b/argocd-apps/apps/garage.yaml
similarity index 100%
rename from argocd-apps/services/garage.yaml
rename to argocd-apps/apps/garage.yaml
diff --git a/argocd-apps/services/jellyfin.yaml b/argocd-apps/apps/jellyfin.yaml
similarity index 100%
rename from argocd-apps/services/jellyfin.yaml
rename to argocd-apps/apps/jellyfin.yaml
diff --git a/argocd-apps/services/kustomization.yaml b/argocd-apps/apps/kustomization.yaml
similarity index 100%
rename from argocd-apps/services/kustomization.yaml
rename to argocd-apps/apps/kustomization.yaml
diff --git a/argocd-apps/services/legislative-summarization.yaml b/argocd-apps/apps/legislative-summarization.yaml
similarity index 100%
rename from argocd-apps/services/legislative-summarization.yaml
rename to argocd-apps/apps/legislative-summarization.yaml
diff --git a/argocd-apps/services/qbit.yaml b/argocd-apps/apps/qbit.yaml
similarity index 100%
rename from argocd-apps/services/qbit.yaml
rename to argocd-apps/apps/qbit.yaml
diff --git a/argocd-apps/services/redoost.yaml b/argocd-apps/apps/redoost.yaml
similarity index 100%
rename from argocd-apps/services/redoost.yaml
rename to argocd-apps/apps/redoost.yaml
diff --git a/argocd-apps/services/rustbin.yaml b/argocd-apps/apps/rustbin.yaml
similarity index 100%
rename from argocd-apps/services/rustbin.yaml
rename to argocd-apps/apps/rustbin.yaml
diff --git a/argocd-apps/services/scriptscribe.yaml b/argocd-apps/apps/scriptscribe.yaml
similarity index 100%
rename from argocd-apps/services/scriptscribe.yaml
rename to argocd-apps/apps/scriptscribe.yaml
diff --git a/argocd-apps/services/splitpro.yaml b/argocd-apps/apps/splitpro.yaml
similarity index 100%
rename from argocd-apps/services/splitpro.yaml
rename to argocd-apps/apps/splitpro.yaml
diff --git a/argocd-apps/services/wireguard.yaml b/argocd-apps/apps/wireguard.yaml
similarity index 100%
rename from argocd-apps/services/wireguard.yaml
rename to argocd-apps/apps/wireguard.yaml
diff --git a/argocd-apps/kustomization.yaml b/argocd-apps/kustomization.yaml
index 414729f..41db24c 100644
--- a/argocd-apps/kustomization.yaml
+++ b/argocd-apps/kustomization.yaml
@@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - add-ons
-  - services
+  - apps