diff --git a/charts/kubezero-argo/templates/argo-cd/kubezero-git-sync-app.yaml b/charts/kubezero-argo/templates/argo-cd/kubezero-git-sync-app.yaml
index 554117b6..3000beb1 100644
--- a/charts/kubezero-argo/templates/argo-cd/kubezero-git-sync-app.yaml
+++ b/charts/kubezero-argo/templates/argo-cd/kubezero-git-sync-app.yaml
@@ -26,6 +26,7 @@ spec:
       prune: true
     syncOptions:
       - ApplyOutOfSyncOnly=true
+      - ServerSideApply=true
   info:
     - name: "Source:"
       value: "https://git.zero-downtime.net/ZeroDownTime/KubeZero/src/branch/release/v1.32/"
diff --git a/charts/kubezero-policy/values.yaml b/charts/kubezero-policy/values.yaml
index 2572653a..562b4896 100644
--- a/charts/kubezero-policy/values.yaml
+++ b/charts/kubezero-policy/values.yaml
@@ -1,6 +1,9 @@
 kyverno:
   enabled: false
 
+# templating:
+#   enabled: true
+
   admissionController:
     revisionHistoryLimit: 2
 
@@ -18,8 +21,8 @@ kyverno:
   backgroundController:
     enabled: false
 
-  cleanupController:
-    enabled: false
+# cleanupController:
+#   enabled: false
 
   reportsController:
     enabled: false
diff --git a/charts/kubezero/templates/_app.tpl b/charts/kubezero/templates/_app.tpl
index b316e41f..c67c40a3 100644
--- a/charts/kubezero/templates/_app.tpl
+++ b/charts/kubezero/templates/_app.tpl
@@ -10,7 +10,7 @@ metadata:
   labels:
     {{- include "kubezero-lib.labels" . | nindent 4 }}
   annotations:
-    argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
+    argocd.argoproj.io/compare-options: IncludeMutationWebhook=true
     # argocd.argoproj.io/sync-options: Replace=true
     {{- with ( index .Values $name "annotations" ) }}
     {{- toYaml . | nindent 4 }}
@@ -42,6 +42,7 @@ spec:
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
+      - ServerSideApply=true
   info:
     - name: "Source:"
       value: "https://git.zero-downtime.net/ZeroDownTime/KubeZero/src/branch/release/v1.31/charts/kubezero-{{ $name }}"
diff --git a/charts/kubezero/templates/argo.yaml b/charts/kubezero/templates/argo.yaml
index 9f8533f4..3bb8101f 100644
--- a/charts/kubezero/templates/argo.yaml
+++ b/charts/kubezero/templates/argo.yaml
@@ -10,9 +10,9 @@ argo-cd:
     params:
     {{- if not $.Values.global.highAvailable }}
       # Reduce load on API server on single node control plane
-      controller.status.processors: 2
-      controller.operation.processors: 1
-      controller.kubectl.parallelism.limit: 1
+      controller.status.processors: 4
+      controller.operation.processors: 2
+      controller.kubectl.parallelism.limit: 2
     {{- else }}
       controller.status.processors: 8
       controller.operation.processors: 4