diff --git a/Jenkinsfile b/Jenkinsfile
index 1716b7d..941cd04 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,5 +5,6 @@ def dummy = ""
 
 prepareAndUploadCharts {
     charts = [ "kube-state-metrics" ]
-    isPublic = true
+    publicChartRepositoryURL = 'https://stakater.github.io/stakater-charts'
+    publicChartGitURL = 'git@github.com:stakater/stakater-charts.git'
 }
diff --git a/kube-state-metrics/templates/deployment.yaml b/kube-state-metrics/templates/deployment.yaml
index 07ddcb1..79fb8d4 100644
--- a/kube-state-metrics/templates/deployment.yaml
+++ b/kube-state-metrics/templates/deployment.yaml
@@ -17,6 +17,10 @@ spec:
         k8s-app: {{ template "kube-state-metrics.name" . }}
     spec:
       serviceAccountName: {{ template "kube-state-metrics.name" . }}
+      {{- if .Values.kubeStateMetrics.tolerations }}
+      tolerations:
+{{ toYaml .Values.kubeStateMetrics.tolerations | indent 8 -}}
+      {{- end }}
       containers:
       - name: {{ template "kube-state-metrics.name" . }}
         image: "{{ .Values.kubeStateMetrics.image.name }}:{{ .Values.kubeStateMetrics.image.tag }}"