diff --git a/apps/app-argocd.yaml b/apps/app-argocd.yaml
new file mode 100644
index 0000000..f583f2d
--- /dev/null
+++ b/apps/app-argocd.yaml
@@ -0,0 +1,20 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: argocd
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: git@forgejo.forgejo.svc.cluster.local:basicstack/stack.basicstack.de.git
+    targetRevision: main
+    path: apps/argocd
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: argocd
+  syncPolicy:
+    automated:
+      prune: false  # Manual approval for deletions
+      selfHeal: true
+    syncOptions:
+    - CreateNamespace=true
diff --git a/apps/argocd/app-stack-basicstack-de.yaml b/apps/argocd/app-stack-basicstack-de.yaml
index e9a9d38..68091db 100644
--- a/apps/argocd/app-stack-basicstack-de.yaml
+++ b/apps/argocd/app-stack-basicstack-de.yaml
@@ -11,6 +11,9 @@ spec:
     path: apps
     directory:
       recurse: true
+      exclude: |
+        argocd/*
+        !argocd/app-*.yaml
   destination:
     server: https://kubernetes.default.svc
   syncPolicy:
diff --git a/apps/argocd/argocd-install.yaml b/apps/argocd/argocd-install.yaml
index 47e9efc..e954941 100644
--- a/apps/argocd/argocd-install.yaml
+++ b/apps/argocd/argocd-install.yaml
@@ -31221,8 +31221,6 @@ kind: ConfigMap
 metadata:
   labels:
     app.kubernetes.io/name: argocd-cm
-  annotations:
-    test.self-management: "enabled"
 data:
   url: https://argo.basicstack.de
   oidc.config: |