diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index 184e05f2..bdc80349 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -90,7 +90,7 @@ spec:
             {{- toYaml . | nindent 10 }}
           {{- end }}
           - name: CODEFRESH_IGNORE_VERSION_CONFIG
-            value: {{ .Values.repoServer.versionConfiguration.disabled | quote }}
+            value: {{ not .Values.applicationVersioning.enabled | quote }}
           {{- if .Values.openshift.enabled }}
           - name: USER_NAME
             value: argocd
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index b8787225..2cfca488 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -26,6 +26,10 @@ openshift:
   # -- enables using arbitrary uid for argo repo server
   enabled: false
 
+applicationVersioning:
+  # -- enables the Codefresh application versioning feature
+  enabled: true
+
 ## Custom resource configuration
 crds:
   # -- Install and upgrade CRDs
@@ -2161,11 +2165,6 @@ repoServer:
   # -- Environment variables to pass to repo server
   env: []
 
-  # Applications versions configuration settings
-  versionConfiguration:
-    # Disable getting version configuration from the Codefresh API
-    disabled: false
-
   # -- envFrom to pass to repo server
   # @default -- `[]` (See [values.yaml])
   envFrom: []