diff --git a/argocd/helm-values.yaml b/argocd/helm-values.yaml
index 9218568..6bef80c 100644
--- a/argocd/helm-values.yaml
+++ b/argocd/helm-values.yaml
@@ -53,7 +53,7 @@ controller:
   # Memory optimization environment variables
   env:
     - name: GOMEMLIMIT
-      value: "400MiB"
+      value: "800MiB"
     - name: GOGC
       value: "50"
 
@@ -64,10 +64,19 @@ controller:
   # Resource settings
   resources:
     requests:
-      cpu: 250m
-      memory: 1700Mi
+      cpu: 476m
+      memory: 1324Mi
     limits:
-      memory: 1700Mi
+      memory: 1324Mi
+
+  # Schedule on master node
+  nodeSelector:
+    node-role.kubernetes.io/control-plane: "true"
+
+  tolerations:
+    - key: node-role.kubernetes.io/control-plane
+      operator: Exists
+      effect: NoSchedule
 
 # =============================================================================
 # API SERVER (Deployment)
@@ -116,9 +125,9 @@ repoServer:
   resources:
     requests:
       cpu: 15m
-      memory: 1536Mi
+      memory: 1200Mi
     limits:
-      memory: 1536Mi
+      memory: 1200Mi
 
 # =============================================================================
 # REDIS (Deployment)