diff --git a/charts/ai/README.md b/charts/ai/README.md
index 565cd4f..eadbeb3 100644
--- a/charts/ai/README.md
+++ b/charts/ai/README.md
@@ -196,6 +196,7 @@ The following table lists the primary configurable parameters and defaults.
 | `serviceAccount.create` | Create a ServiceAccount | `true` |
 | `serviceAccount.name` | ServiceAccount name | `codetogether-ai` |
 | `replicaCount` | Deployment replica count | `1` |
+| `manageReplicas` | Render `spec.replicas`; set `false` when external scaling tools own replica count | `true` |
 | `readinessProbe.path` | Readiness endpoint on port 1080 | `/healthz` |
 | `livenessProbe.path` | Liveness endpoint on port 8080 | `/actuator/health` |
 | `startupProbe.enabled` | Enable startup probe | `true` |
@@ -287,6 +288,27 @@ helm upgrade codetogether-ai codetogether/codetogether-ai \
 
 The Deployment rolls when the chart-managed properties Secret changes.
 
+### Server-side apply replica conflicts
+
+Some clusters use external scaling automation, HPA, or `kubectl scale` to manage
+Deployment replica count. If that manager owns `.spec.replicas`, Helm upgrades
+can fail with a server-side apply conflict similar to:
+
+```text
+conflict with "agent" using apps/v1: .spec.replicas
+```
+
+Set `manageReplicas: false` in your custom `values.yaml` to make Helm omit
+`spec.replicas` and leave replica ownership to the external tool:
+
+```yaml
+manageReplicas: false
+```
+
+The default remains `manageReplicas: true`, preserving existing production
+behavior. Internal or CI overlays that must pin a replica count should keep
+`manageReplicas: true`.
+
 ## Uninstall
 
 ```bash
diff --git a/charts/ai/templates/deployment.yaml b/charts/ai/templates/deployment.yaml
index 6e34fa3..2acada4 100644
--- a/charts/ai/templates/deployment.yaml
+++ b/charts/ai/templates/deployment.yaml
@@ -6,7 +6,9 @@ metadata:
   labels:
     {{- include "ctai.labels" . | nindent 4 }}
 spec:
+  {{- if .Values.manageReplicas }}
   replicas: {{ .Values.replicaCount }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "ctai.selectorLabels" . | nindent 6 }}
diff --git a/charts/ai/values.yaml b/charts/ai/values.yaml
index 5ae934f..c057089 100644
--- a/charts/ai/values.yaml
+++ b/charts/ai/values.yaml
@@ -127,6 +127,10 @@ nodeSelector: {}
 tolerations: []
 affinity: {}
 replicaCount: 1
+# When false, Helm omits spec.replicas so external tools (HPA, kubectl scale,
+# cluster automation) can own replica count without SSA conflicts on upgrade.
+# Fresh installs still default to 1 pod when replicas is omitted.
+manageReplicas: true
 
 extraEnvVars: []
 extraVolumes: []