diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 14e8ac12..79ecb785 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.11-2024.8.19-6be897266
 kubeVersion: ">=1.23.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 6.11.1-7-cap-2.11-2024.8.19-6be897266
+version: 6.11.1-8-cap-2.11-repo-server-cftoken-fix
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index 3e5e6dfc..1715a855 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -293,7 +293,7 @@ spec:
               secretKeyRef:
                 key: token
                 name: codefresh-token
-                optional: true
+                optional: {{ not .Values.applicationVersioning.enabled }}
           {{- if .Values.repoServer.useEphemeralHelmWorkingDir }}
           - name: HELM_CACHE_HOME
             value: /helm-working-dir