diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index 422bd75db..6c7b573a3 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -1636,7 +1636,7 @@ To read more about this component, please read [Argo CD Manifest Hydrator] and [
 | commitServer.deploymentStrategy | object | `{}` | Deployment strategy to be added to the commit server Deployment |
 | commitServer.dnsConfig | object | `{}` | [DNS configuration] |
 | commitServer.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for commit server pods |
-| commitServer.enabled | bool | `true` | Enable commit server |
+| commitServer.enabled | bool | `false` | Enable commit server |
 | commitServer.extraArgs | list | `[]` | commit server command line flags |
 | commitServer.extraEnv | list | `[]` | Environment variables to pass to the commit server |
 | commitServer.extraEnvFrom | list | `[]` (See [values.yaml]) | envFrom to pass to the commit server |
diff --git a/charts/argo-cd/ci/with-commit-server-values.yaml b/charts/argo-cd/ci/with-commit-server-values.yaml
new file mode 100644
index 000000000..b4ffedca7
--- /dev/null
+++ b/charts/argo-cd/ci/with-commit-server-values.yaml
@@ -0,0 +1,3 @@
+# Test Argo CD with optional component "commit-server"
+commitServer:
+  enabled: true
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 600604ee6..3b6f95810 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -3753,7 +3753,7 @@ notifications:
 
 commitServer:
   # -- Enable commit server
-  enabled: true
+  enabled: false
 
   # -- Commit server name
   name: commit-server