diff --git a/stable/distribution/CHANGELOG.md b/stable/distribution/CHANGELOG.md
index 69f6565b9..e327edffc 100644
--- a/stable/distribution/CHANGELOG.md
+++ b/stable/distribution/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Distribution Chart Changelog
 All changes to this project chart be documented in this file.
 
+## [6.1.1] -  Jul 9, 2020
+* Fix an issue found in upgrade, when using helm upgrade --resue-values
+
 ## [6.1.0] -  Jul 7, 2020
 * Update Distribution version 2.4.0
 * **IMPORTANT**
diff --git a/stable/distribution/Chart.yaml b/stable/distribution/Chart.yaml
index dca5ba045..e8d770c8b 100644
--- a/stable/distribution/Chart.yaml
+++ b/stable/distribution/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 name: distribution
 home: https://jfrog.com/platform/
 description: A Helm chart for JFrog Distribution
-version: 6.1.0
+version: 6.1.1
 appVersion: 2.4.0
 sources:
 - https://bintray.com/jfrog/product/distribution/view
diff --git a/stable/distribution/templates/distribution-statefulset.yaml b/stable/distribution/templates/distribution-statefulset.yaml
index 3eac70020..0e36489c1 100644
--- a/stable/distribution/templates/distribution-statefulset.yaml
+++ b/stable/distribution/templates/distribution-statefulset.yaml
@@ -97,7 +97,7 @@ spec:
           echo "Waiting for database to be ready...";
           until nc -z -w 2 {{ .Release.Name }}-postgresql {{ .Values.postgresql.service.port }} && echo {{ .Release.Name }}-postgresql ok; do sleep 2; done;
       {{- end }}
-      {{- if .Release.IsUpgrade }}
+      {{- if and .Release.IsUpgrade .Values.distribution.migration.enabled }}
       - name: migration-{{ .Values.distribution.name }}
         image: '{{ .Values.distribution.image.repository }}:{{ default .Chart.AppVersion .Values.distribution.image.version }}'
         imagePullPolicy: {{ .Values.distribution.image.imagePullPolicy }}
diff --git a/stable/distribution/values.yaml b/stable/distribution/values.yaml
index e4eee635b..e6ffa4a79 100644
--- a/stable/distribution/values.yaml
+++ b/stable/distribution/values.yaml
@@ -204,6 +204,10 @@ distribution:
   ## Artifactory URL . Mandatory
   jfrogUrl:
 
+  ## Migration support from 1.x to 2.x app versions
+  migration:
+    enabled: false
+
   serviceId:
 
   ## Extra environment variables that can be used to tune Distribution to your needs.