diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index ea9ccfab..5b32326e 100644
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -105,7 +105,9 @@ spec:
       affinity:
 {{- toYaml .Values.repoServer.affinity | nindent 8 }}
     {{- end }}
+    {{- if .Values.repoServer.serviceAccount.create }}
       serviceAccountName: {{ template "argo-cd.repoServerServiceAccountName" . }}
+    {{- end }}
       volumes:
       {{- if .Values.repoServer.volumes }}
 {{- toYaml .Values.repoServer.volumes | nindent 8}}
diff --git a/charts/argo-cd/templates/argocd-repo-server/role.yaml b/charts/argo-cd/templates/argocd-repo-server/role.yaml
index 9beefcd0..9c902ccc 100644
--- a/charts/argo-cd/templates/argocd-repo-server/role.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/role.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.repoServer.serviceAccount.create }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -13,3 +14,4 @@ rules:
 {{- if .Values.repoServer.rbac }}
 {{toYaml .Values.repoServer.rbac }}
 {{- end }}
+{{- end }}
diff --git a/charts/argo-cd/templates/argocd-repo-server/rolebinding.yaml b/charts/argo-cd/templates/argocd-repo-server/rolebinding.yaml
index f028b064..692b11ee 100644
--- a/charts/argo-cd/templates/argocd-repo-server/rolebinding.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/rolebinding.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.repoServer.serviceAccount.create }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -16,4 +17,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ template "argo-cd.repoServerServiceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
\ No newline at end of file
+  namespace: {{ .Release.Namespace }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/argo-cd/templates/argocd-repo-server/serviceaccount.yaml b/charts/argo-cd/templates/argocd-repo-server/serviceaccount.yaml
index 885ea321..6536b005 100644
--- a/charts/argo-cd/templates/argocd-repo-server/serviceaccount.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/serviceaccount.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.repoServer.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -8,4 +9,5 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: {{ .Values.repoServer.name }}
\ No newline at end of file
+    app.kubernetes.io/component: {{ .Values.repoServer.name }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 06442895..95eacebe 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -478,21 +478,23 @@ repoServer:
     #   namespace: monitoring
     #   additionalLabels: {}
 
+  ## Repo server service account
+  ## If create is set to true, make sure to uncomment the name and update the rbac section below
   serviceAccount:
-    create: true
-    name: argocd-repo-server
-    
+    create: false
+  #  name: argocd-repo-server
+
   ## Repo server rbac rules
-  #rbac:   
-  #- apiGroups:
-  #  - argoproj.io
-  #  resources:
-  #  - applications
-  #  verbs:
-  #  - get
-  #  - list
-  #  - watch
-  
+ # rbac:    
+ #   - apiGroups:
+ #     - argoproj.io
+ #     resources:
+ #     - applications
+ #     verbs:
+ #     - get
+ #     - list
+ #     - watch
+
 ## Argo Configs
 configs:
   knownHosts: