diff --git a/argocd/argocd-cm-patch.yaml b/argocd/argocd-cm-patch.yaml
index 5df917a..a59270d 100644
--- a/argocd/argocd-cm-patch.yaml
+++ b/argocd/argocd-cm-patch.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: argocd-cm
-  namespace: argocd
 data:
   oidc.config: |
     name: Keycloak
diff --git a/argocd/argocd-rbac-cm.yaml b/argocd/argocd-rbac-cm-patch.yaml
similarity index 50%
rename from argocd/argocd-rbac-cm.yaml
rename to argocd/argocd-rbac-cm-patch.yaml
index 8aec029..405f801 100644
--- a/argocd/argocd-rbac-cm.yaml
+++ b/argocd/argocd-rbac-cm-patch.yaml
@@ -1,11 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  labels:
-    app.kubernetes.io/name: argocd-rbac-cm
-    app.kubernetes.io/part-of: argocd
   name: argocd-rbac-cm
-  namespace: argocd
 data:
   policy.csv: |
     g, argo-admin, role:admin
\ No newline at end of file
diff --git a/argocd/argocd-self-application.yaml b/argocd/argocd-self-application.yaml
index 11b1592..4b6c509 100644
--- a/argocd/argocd-self-application.yaml
+++ b/argocd/argocd-self-application.yaml
@@ -13,6 +13,9 @@ spec:
     server: https://kubernetes.default.svc
     namespace: argocd
   syncPolicy:
+  # Needed for ArgoCD to manage itself, otherwise it would not be able to update itself when the application manifest changes
+    syncOptions:
+      - ServerSideApply=true
     automated:
       prune: true
       selfHeal: true
diff --git a/argocd/kustomization.yaml b/argocd/kustomization.yaml
index bd395ed..25e5a10 100644
--- a/argocd/kustomization.yaml
+++ b/argocd/kustomization.yaml
@@ -8,10 +8,5 @@ resources:
   - argocd-self-application.yaml
 
 patches:
-  - target:
-      group: ""
-      version: v1
-      kind: ConfigMap
-      name: argocd-cm
-      namespace: argocd
-    path: argocd-cm-patch.yaml
+  - path: argocd-cm-patch.yaml
+  - path: argocd-rbac-cm-patch.yaml