diff --git a/charts/rancher-istio/0.0.2/Chart.yaml b/charts/rancher-istio/0.0.2/Chart.yaml
index 9d532841a38a1818a3353445cd71dba06c5c6245..2794a00a1e536db60d744683cfc6ace51b1dc52c 100644
--- a/charts/rancher-istio/0.0.2/Chart.yaml
+++ b/charts/rancher-istio/0.0.2/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: rancher-istio
 version: 0.0.2
-appVersion: 1.2.0
+appVersion: 1.2.4
 tillerVersion: ">=2.7.2-0"
 description: Helm chart for all istio components
 home: https://istio.io/
diff --git a/charts/rancher-istio/0.0.2/charts/certmanager/templates/deployment.yaml b/charts/rancher-istio/0.0.2/charts/certmanager/templates/deployment.yaml
index 79ed47dc95b538779d2710f0a3be19c6b496a388..2999c287f7e5c2861d7408ca928213186de2cbfc 100644
--- a/charts/rancher-istio/0.0.2/charts/certmanager/templates/deployment.yaml
+++ b/charts/rancher-istio/0.0.2/charts/certmanager/templates/deployment.yaml
@@ -54,7 +54,6 @@ spec:
               fieldPath: metadata.namespace
         resources:
 {{ toYaml .Values.resources | indent 10 }}
-      
       {{- if .Values.podDnsPolicy }}
       dnsPolicy: {{ .Values.podDnsPolicy }}
       {{- end }}
@@ -68,4 +67,7 @@ spec:
 {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 6 }}
-{{- end }}
\ No newline at end of file
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/galley/templates/deployment.yaml b/charts/rancher-istio/0.0.2/charts/galley/templates/deployment.yaml
index 9d94948e6fa2fda1adfe2982c3de4c21e016a9f8..befae201711e594c9b487d8f6ddd674883d36f9e 100644
--- a/charts/rancher-istio/0.0.2/charts/galley/templates/deployment.yaml
+++ b/charts/rancher-istio/0.0.2/charts/galley/templates/deployment.yaml
@@ -111,7 +111,10 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
-{{- if .Values.tolerations }}
+      {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 6 }}
-{{- end }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/gateways/templates/deployment.yaml b/charts/rancher-istio/0.0.2/charts/gateways/templates/deployment.yaml
index c17e620aa07967ebec5454f6dc144b8a98bf305f..47b0413cac804ea805e867687a0faa20f54b72ca 100644
--- a/charts/rancher-istio/0.0.2/charts/gateways/templates/deployment.yaml
+++ b/charts/rancher-istio/0.0.2/charts/gateways/templates/deployment.yaml
@@ -156,6 +156,10 @@ spec:
           {{- else }}
           - istio-pilot:15010
           {{- end }}
+          {{- if $spec.applicationPorts }}
+          - --applicationPorts
+          - "{{ $spec.applicationPorts }}"
+          {{- end }}
         {{- end }}
         {{- if $.Values.global.trustDomain }}
           - --trust-domain={{ $.Values.global.trustDomain }}
@@ -290,10 +294,13 @@ spec:
       affinity:
       {{- include "gatewaynodeaffinity" (dict "root" $ "nodeSelector" $spec.nodeSelector) | indent 6 }}
       {{- include "gatewaypodAntiAffinity" (dict "podAntiAffinityLabelSelector" $spec.podAntiAffinityLabelSelector "podAntiAffinityTermLabelSelector" $spec.podAntiAffinityTermLabelSelector) | indent 6 }}
-{{- if $spec.tolerations }}
+      {{- if $spec.tolerations }}
       tolerations:
 {{ toYaml $spec.tolerations | indent 6 }}
-{{- end }}
+      {{- else if $.Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml $.Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
 ---
 {{- end }}
 {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/grafana/templates/create-custom-resources-job.yaml b/charts/rancher-istio/0.0.2/charts/grafana/templates/create-custom-resources-job.yaml
index c310c1e7b0976381e6aba30bbd730a7685abe925..3246a0d2dc8b56dd56d0894f48d959dd44677873 100644
--- a/charts/rancher-istio/0.0.2/charts/grafana/templates/create-custom-resources-job.yaml
+++ b/charts/rancher-istio/0.0.2/charts/grafana/templates/create-custom-resources-job.yaml
@@ -93,4 +93,11 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 6 }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
 {{- end -}}
diff --git a/charts/rancher-istio/0.0.2/charts/grafana/templates/deployment.yaml b/charts/rancher-istio/0.0.2/charts/grafana/templates/deployment.yaml
index f8e50daaeea6395325513d66ebf45a1c23f98855..6eca77a3c01173a474e508c0ad23a7719602289c 100644
--- a/charts/rancher-istio/0.0.2/charts/grafana/templates/deployment.yaml
+++ b/charts/rancher-istio/0.0.2/charts/grafana/templates/deployment.yaml
@@ -120,10 +120,13 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
-{{- if .Values.tolerations }}
+      {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 6 }}
-{{- end }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
       volumes:
       - name: config
         configMap:
diff --git a/charts/rancher-istio/0.0.2/charts/grafana/templates/tests/test-grafana-connection.yaml b/charts/rancher-istio/0.0.2/charts/grafana/templates/tests/test-grafana-connection.yaml
index 18899bb7205bdc2b100259ec768457e89840dc31..382de193335d3a075297c6cb8ceecfb92678e27b 100644
--- a/charts/rancher-istio/0.0.2/charts/grafana/templates/tests/test-grafana-connection.yaml
+++ b/charts/rancher-istio/0.0.2/charts/grafana/templates/tests/test-grafana-connection.yaml
@@ -27,4 +27,11 @@ spec:
   affinity:
     {{- include "nodeaffinity" . | indent 4 }}
     {{- include "podAntiAffinity" . | indent 4 }}
+  {{- if .Values.tolerations }}
+  tolerations:
+{{ toYaml .Values.tolerations | indent 2 }}
+  {{- else if .Values.global.defaultTolerations }}
+  tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 2 }}
+  {{- end }}
 {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/istio-init/files/crd-10.yaml b/charts/rancher-istio/0.0.2/charts/istio-init/files/crd-10.yaml
index aeff65ee7e8db419bace3ee77cc9392458878671..05162d6a954f19d96fc55ba2b41a29e95e49e424 100644
--- a/charts/rancher-istio/0.0.2/charts/istio-init/files/crd-10.yaml
+++ b/charts/rancher-istio/0.0.2/charts/istio-init/files/crd-10.yaml
@@ -151,27 +151,6 @@ spec:
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
-metadata:
-  name: sidecars.networking.istio.io
-  labels:
-    app: istio-pilot
-    chart: istio
-    heritage: Tiller
-    release: istio
-spec:
-  group: networking.istio.io
-  names:
-    kind: Sidecar
-    plural: sidecars
-    singular: sidecar
-    categories:
-    - istio-io
-    - networking-istio-io
-  scope: Namespaced
-  version: v1alpha3 
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
 metadata:
   name: envoyfilters.networking.istio.io
   labels:
diff --git a/charts/rancher-istio/0.0.2/charts/istiocoredns/templates/deployment.yaml b/charts/rancher-istio/0.0.2/charts/istiocoredns/templates/deployment.yaml
index ae7033c6f9c46d8c1ed2257402d299a56289bd90..708500a588e13135aed94edb332a0f886cc43d20 100644
--- a/charts/rancher-istio/0.0.2/charts/istiocoredns/templates/deployment.yaml
+++ b/charts/rancher-istio/0.0.2/charts/istiocoredns/templates/deployment.yaml
@@ -87,7 +87,10 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
-{{- if .Values.tolerations }}
+      {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 6 }}
-{{- end }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/kiali/templates/deployment.yaml b/charts/rancher-istio/0.0.2/charts/kiali/templates/deployment.yaml
index fbd08d088f90263cf4aef2c0664b4b3a24fad219..0cd4ccf480c04cc32a9569fbccbe2052ef01e7d5 100644
--- a/charts/rancher-istio/0.0.2/charts/kiali/templates/deployment.yaml
+++ b/charts/rancher-istio/0.0.2/charts/kiali/templates/deployment.yaml
@@ -111,3 +111,10 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 6 }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/kiali/templates/tests/test-kiali-connection.yaml b/charts/rancher-istio/0.0.2/charts/kiali/templates/tests/test-kiali-connection.yaml
index a5644197666f2409875bc9bab5703a9b3b531fd4..6a1ecddd472c399995e5fe4a72434454ea197a39 100644
--- a/charts/rancher-istio/0.0.2/charts/kiali/templates/tests/test-kiali-connection.yaml
+++ b/charts/rancher-istio/0.0.2/charts/kiali/templates/tests/test-kiali-connection.yaml
@@ -27,4 +27,11 @@ spec:
   affinity:
     {{- include "nodeaffinity" . | indent 4 }}
     {{- include "podAntiAffinity" . | indent 4 }}
+  {{- if .Values.tolerations }}
+  tolerations:
+{{ toYaml .Values.tolerations | indent 2 }}
+  {{- else if .Values.global.defaultTolerations }}
+  tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 2 }}
+  {{- end }}
 {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/kiali/values.yaml b/charts/rancher-istio/0.0.2/charts/kiali/values.yaml
index 4ccca1a65ccadce472862cd3ee27538036235094..24c388b63bf0270e021ff37349415f662efba2ba 100644
--- a/charts/rancher-istio/0.0.2/charts/kiali/values.yaml
+++ b/charts/rancher-istio/0.0.2/charts/kiali/values.yaml
@@ -5,6 +5,7 @@ enabled: false # Note that if using the demo or demo-auth yaml when installing v
 replicaCount: 1
 contextPath: /
 nodeSelector: {}
+tolerations: []
 
 # Specify the pod anti-affinity that allows you to constrain which nodes
 # your pod is eligible to be scheduled based on labels on pods that are
diff --git a/charts/rancher-istio/0.0.2/charts/mixer/templates/deployment.yaml b/charts/rancher-istio/0.0.2/charts/mixer/templates/deployment.yaml
index ffa6c2f14123cd0f25a352265b5da68ed38a872a..baacbc3d4ce3124a3c10fef92fe909a4a8375d31 100644
--- a/charts/rancher-istio/0.0.2/charts/mixer/templates/deployment.yaml
+++ b/charts/rancher-istio/0.0.2/charts/mixer/templates/deployment.yaml
@@ -32,10 +32,13 @@
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
-{{- if .Values.tolerations }}
+      {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 6 }}
-{{- end }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
       containers:
       - name: mixer
         image: "{{ template "system_default_registry" . }}{{ $.Values.repository }}:{{ $.Values.tag }}"
@@ -204,10 +207,13 @@
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
-{{- if .Values.tolerations }}
+      {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 6 }}
-{{- end }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
       containers:
       - name: mixer
         image: "{{ template "system_default_registry" . }}{{ $.Values.repository }}:{{ $.Values.tag }}"
diff --git a/charts/rancher-istio/0.0.2/charts/nodeagent/templates/daemonset.yaml b/charts/rancher-istio/0.0.2/charts/nodeagent/templates/daemonset.yaml
index b2e0882d91a65c33c11fa13a12d2522e3b3b3284..b4c444c47095406b2c875486ea9d4b8d56217058 100644
--- a/charts/rancher-istio/0.0.2/charts/nodeagent/templates/daemonset.yaml
+++ b/charts/rancher-istio/0.0.2/charts/nodeagent/templates/daemonset.yaml
@@ -51,8 +51,12 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
-
-{{- if .Values.tolerations }}
+      {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 6 }}
-{{- end }}
\ No newline at end of file
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
+  updateStrategy:
+    type: RollingUpdate
\ No newline at end of file
diff --git a/charts/rancher-istio/0.0.2/charts/pilot/templates/deployment.yaml b/charts/rancher-istio/0.0.2/charts/pilot/templates/deployment.yaml
index beb1b43b2ceb0a8557b0c68599ab786df504fc14..9e5e88636d84ea90acfff54ca663b8e391a8fc1c 100644
--- a/charts/rancher-istio/0.0.2/charts/pilot/templates/deployment.yaml
+++ b/charts/rancher-istio/0.0.2/charts/pilot/templates/deployment.yaml
@@ -208,7 +208,10 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
-{{- if .Values.tolerations }}
+      {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 6 }}
-{{- end }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/prometheus/templates/deployment.yaml b/charts/rancher-istio/0.0.2/charts/prometheus/templates/deployment.yaml
index 5bb868818d5a0f0c833ee89ed15749d6f6ed37c1..2031282e1cde1ce7456b3175339a54cd318fb351 100644
--- a/charts/rancher-istio/0.0.2/charts/prometheus/templates/deployment.yaml
+++ b/charts/rancher-istio/0.0.2/charts/prometheus/templates/deployment.yaml
@@ -100,8 +100,11 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
-{{- if .Values.tolerations }}
+      {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 6 }}
-{{- end }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
 {{- end -}}
diff --git a/charts/rancher-istio/0.0.2/charts/prometheus/templates/tests/test-prometheus-connection.yaml b/charts/rancher-istio/0.0.2/charts/prometheus/templates/tests/test-prometheus-connection.yaml
index 18de20926141fc61a9a01eccb259ae09b25e5606..fbff1e6a53ee7f27910193bd684003c186a340b9 100644
--- a/charts/rancher-istio/0.0.2/charts/prometheus/templates/tests/test-prometheus-connection.yaml
+++ b/charts/rancher-istio/0.0.2/charts/prometheus/templates/tests/test-prometheus-connection.yaml
@@ -26,4 +26,11 @@ spec:
   affinity:
     {{- include "nodeaffinity" . | indent 4 }}
     {{- include "podAntiAffinity" . | indent 4 }}
+  {{- if .Values.tolerations }}
+  tolerations:
+{{ toYaml .Values.tolerations | indent 2 }}
+  {{- else if .Values.global.defaultTolerations }}
+  tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 2 }}
+  {{- end }}
 {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/security/templates/cleanup-secrets.yaml b/charts/rancher-istio/0.0.2/charts/security/templates/cleanup-secrets.yaml
index 5360c4bc83ef4d725d109c6380a6fcdca9f5d47f..ee78df5aee367f8a4c6759eb9ca5dc7575ea4815 100644
--- a/charts/rancher-istio/0.0.2/charts/security/templates/cleanup-secrets.yaml
+++ b/charts/rancher-istio/0.0.2/charts/security/templates/cleanup-secrets.yaml
@@ -116,3 +116,10 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 6 }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/security/templates/create-custom-resources-job.yaml b/charts/rancher-istio/0.0.2/charts/security/templates/create-custom-resources-job.yaml
index 4ebd51fb1402c6ea89b4d7b71fb2985608df673d..18ab9993d439c4aa2c5c0fbfb6ae13398c59d5bb 100644
--- a/charts/rancher-istio/0.0.2/charts/security/templates/create-custom-resources-job.yaml
+++ b/charts/rancher-istio/0.0.2/charts/security/templates/create-custom-resources-job.yaml
@@ -91,4 +91,11 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 6 }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
 {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/security/templates/deployment.yaml b/charts/rancher-istio/0.0.2/charts/security/templates/deployment.yaml
index e40c5878ead883da4801cb69c1726b69a79ef6fe..53c4dea211abfdc219456c6ce34f9235928931fe 100644
--- a/charts/rancher-istio/0.0.2/charts/security/templates/deployment.yaml
+++ b/charts/rancher-istio/0.0.2/charts/security/templates/deployment.yaml
@@ -11,7 +11,7 @@ metadata:
     release: {{ .Release.Name }}
     istio: citadel
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       istio: citadel
@@ -39,6 +39,9 @@ spec:
           image: "{{ template "system_default_registry" . }}{{ .Values.repository }}:{{ .Values.tag }}"
           imagePullPolicy: {{ .Values.global.imagePullPolicy }}
           args:
+          {{- if .Values.global.sds.enabled }}
+            - --sds-enabled=true
+          {{- end }}
             - --append-dns-names=true
             - --grpc-port=8060
             - --citadel-storage-namespace={{ .Release.Namespace }}
@@ -56,6 +59,9 @@ spec:
           {{- if .Values.global.trustDomain }}
             - --trust-domain={{ .Values.global.trustDomain }}
           {{- end }}
+          {{- if .Values.workloadCertTtl }}
+            - --workload-cert-ttl={{ .Values.workloadCertTtl }}
+          {{- end }}
           {{- if .Values.citadelHealthCheck }}
             - --liveness-probe-path=/tmp/ca.liveness # path to the liveness health check status file
             - --liveness-probe-interval=60s # interval for health check file update
@@ -92,7 +98,10 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
-{{- if .Values.tolerations }}
+      {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 6 }}
-{{- end }}
\ No newline at end of file
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/security/templates/tests/test-citadel-connection.yaml b/charts/rancher-istio/0.0.2/charts/security/templates/tests/test-citadel-connection.yaml
index 7ea04b9e1156ade5fffa9e16f4b3df0f992d0ffe..a1ec31c8dc28e545d9a354d8ea0dac51a1b15590 100644
--- a/charts/rancher-istio/0.0.2/charts/security/templates/tests/test-citadel-connection.yaml
+++ b/charts/rancher-istio/0.0.2/charts/security/templates/tests/test-citadel-connection.yaml
@@ -26,4 +26,11 @@ spec:
   affinity:
     {{- include "nodeaffinity" . | indent 4 }}
     {{- include "podAntiAffinity" . | indent 4 }}
+  {{- if .Values.tolerations }}
+  tolerations:
+{{ toYaml .Values.tolerations | indent 2 }}
+  {{- else if .Values.global.defaultTolerations }}
+  tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 2 }}
+  {{- end }}
 {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/security/values.yaml b/charts/rancher-istio/0.0.2/charts/security/values.yaml
index 97426d0b602ccb7715c995a6620dbdfdcb4749a9..de42cff63b87f731a9c1a40b2d2f5e3fefde3877 100644
--- a/charts/rancher-istio/0.0.2/charts/security/values.yaml
+++ b/charts/rancher-istio/0.0.2/charts/security/values.yaml
@@ -2,6 +2,7 @@
 # security configuration
 #
 enabled: true
+replicaCount: 1
 selfSigned: true # indicate if self-signed CA is used.
 createMeshPolicy: true
 nodeSelector: {}
@@ -9,6 +10,8 @@ tolerations: []
 # Enable health checking on the Citadel CSR signing API.
 # https://istio.io/docs/tasks/security/health-check/
 citadelHealthCheck: false
+# 90*24hour = 2160h
+workloadCertTtl: 2160h
 
 # Specify the pod anti-affinity that allows you to constrain which nodes
 # your pod is eligible to be scheduled based on labels on pods that are
diff --git a/charts/rancher-istio/0.0.2/charts/sidecarInjectorWebhook/templates/deployment.yaml b/charts/rancher-istio/0.0.2/charts/sidecarInjectorWebhook/templates/deployment.yaml
index 2a5df06553eb9e5efcf3bafd09d7aedc0dcc2315..7b6e9da07f06228808d6ddb603e9225b4dc3a5b9 100644
--- a/charts/rancher-istio/0.0.2/charts/sidecarInjectorWebhook/templates/deployment.yaml
+++ b/charts/rancher-istio/0.0.2/charts/sidecarInjectorWebhook/templates/deployment.yaml
@@ -97,3 +97,10 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 6 }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
diff --git a/charts/rancher-istio/0.0.2/charts/sidecarInjectorWebhook/values.yaml b/charts/rancher-istio/0.0.2/charts/sidecarInjectorWebhook/values.yaml
index 64d413b4de743ddb1954120368c4893a3172f368..59a344c3b11c0966085387dd1b84679b3d62b64c 100644
--- a/charts/rancher-istio/0.0.2/charts/sidecarInjectorWebhook/values.yaml
+++ b/charts/rancher-istio/0.0.2/charts/sidecarInjectorWebhook/values.yaml
@@ -5,6 +5,7 @@ enabled: true
 replicaCount: 1
 enableNamespacesByDefault: false
 nodeSelector: {}
+tolerations: []
 
 # Specify the pod anti-affinity that allows you to constrain which nodes
 # your pod is eligible to be scheduled based on labels on pods that are
diff --git a/charts/rancher-istio/0.0.2/charts/tracing/templates/deployment-jaeger.yaml b/charts/rancher-istio/0.0.2/charts/tracing/templates/deployment-jaeger.yaml
index a12102051800e5a6da107d62b6ba175fecd4164f..3e11b032922113be541adb257ff1a2102c53e442 100644
--- a/charts/rancher-istio/0.0.2/charts/tracing/templates/deployment-jaeger.yaml
+++ b/charts/rancher-istio/0.0.2/charts/tracing/templates/deployment-jaeger.yaml
@@ -109,4 +109,11 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 6 }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
 {{ end }}
diff --git a/charts/rancher-istio/0.0.2/charts/tracing/templates/deployment-zipkin.yaml b/charts/rancher-istio/0.0.2/charts/tracing/templates/deployment-zipkin.yaml
index 8caefea1398728d768be9d8a4b3879ec98e49ff0..ac74cae8b6e5d723f1aa21c1c171111e5378a690 100644
--- a/charts/rancher-istio/0.0.2/charts/tracing/templates/deployment-zipkin.yaml
+++ b/charts/rancher-istio/0.0.2/charts/tracing/templates/deployment-zipkin.yaml
@@ -99,4 +99,11 @@ spec:
       affinity:
       {{- include "nodeaffinity" . | indent 6 }}
       {{- include "podAntiAffinity" . | indent 6 }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 6 }}
+      {{- else if .Values.global.defaultTolerations }}
+      tolerations:
+{{ toYaml .Values.global.defaultTolerations | indent 6 }}
+      {{- end }}
 {{ end }}
diff --git a/charts/rancher-istio/0.0.2/charts/tracing/values.yaml b/charts/rancher-istio/0.0.2/charts/tracing/values.yaml
index 778674307d776bc1c9e29f0998a5196260d889d3..8620663ea58234d98026dba00170fd1b126f7c76 100644
--- a/charts/rancher-istio/0.0.2/charts/tracing/values.yaml
+++ b/charts/rancher-istio/0.0.2/charts/tracing/values.yaml
@@ -5,6 +5,7 @@ enabled: false
 
 provider: jaeger
 nodeSelector: {}
+tolerations: []
 
 # Specify the pod anti-affinity that allows you to constrain which nodes
 # your pod is eligible to be scheduled based on labels on pods that are
diff --git a/charts/rancher-istio/0.0.2/questions.yml b/charts/rancher-istio/0.0.2/questions.yml
index b800b4dfcd0b6021052727e7d4a1384eed149f0d..e8318e245d4276852f842c3249221b86adb4e4ef 100644
--- a/charts/rancher-istio/0.0.2/questions.yml
+++ b/charts/rancher-istio/0.0.2/questions.yml
@@ -1,2 +1,2 @@
 labels:
-  rancher.istio.v0.0.2: 1.2.0
+  rancher.istio.v0.0.2: 1.2.4
diff --git a/charts/rancher-istio/0.0.2/values.yaml b/charts/rancher-istio/0.0.2/values.yaml
index 2bc0ed541ba05ed82550c53d2f2c99fe6452a5b9..6365bb47f28176a5d96dbf058d4c22480dfe2771 100644
--- a/charts/rancher-istio/0.0.2/values.yaml
+++ b/charts/rancher-istio/0.0.2/values.yaml
@@ -26,7 +26,7 @@ gateways:
 #
 sidecarInjectorWebhook:
   repository: rancher/istio-sidecar_injector
-  tag: "1.2.0"
+  tag: "1.2.4"
   enabled: true
 
 #
@@ -35,7 +35,7 @@ sidecarInjectorWebhook:
 #
 galley:
   repository: rancher/istio-galley
-  tag: 1.2.0
+  tag: 1.2.4
   enabled: true
 
 #
@@ -44,7 +44,7 @@ galley:
 # @see charts/mixer/values.yaml, it takes precedence
 mixer:
   repository: rancher/istio-mixer
-  tag: "1.2.0"
+  tag: "1.2.4"
   enabled: true
   policy:
     # if policy is enabled the global.disablePolicyChecks has affect.
@@ -58,7 +58,7 @@ mixer:
 # @see charts/pilot/values.yaml
 pilot:
   repository: rancher/istio-pilot
-  tag: "1.2.0"
+  tag: "1.2.4"
   enabled: true
 
 #
@@ -66,7 +66,7 @@ pilot:
 #
 security:
   repository: rancher/istio-citadel
-  tag: "1.2.0"
+  tag: "1.2.4"
   enabled: true
 
 #
@@ -160,7 +160,7 @@ global:
 
   # Default tag for Istio images.
   # tag: release-1.1-latest-daily
-  tag: 1.2.0
+  tag: 1.2.4
 
   # Comma-separated minimum per-scope logging level of messages to output, in the form of <scope>:<level>,<scope>:<level>
   # The control plane has different scopes depending on component, but can configure default log level across all components
@@ -170,7 +170,7 @@ global:
 
   kubectl:
     repository: rancher/istio-kubectl
-    tag: 1.2.0
+    tag: 1.2.4
 
   # monitoring port used by mixer, pilot, galley
   monitoringPort: 15014
@@ -194,7 +194,7 @@ global:
 
   proxy:
     repository: rancher/istio-proxyv2
-    tag: 1.2.0
+    tag: 1.2.4
 
     # cluster domain. Default value is "cluster.local".
     clusterDomain: "cluster.local"
@@ -308,7 +308,7 @@ global:
   proxy_init:
     # Base name for the proxy_init container, used to configure iptables.
     repository: rancher/istio-proxy_init
-    tag: "1.2.0"
+    tag: "1.2.4"
 
   # imagePullPolicy is applied to istio control plane components.
   # local tests require IfNotPresent, to avoid uploading to dockerhub.
@@ -389,6 +389,14 @@ global:
   # the desired values.
   defaultNodeSelector: {}
 
+  # Default node tolerations to be applied to all deployments so that all pods can be
+  # scheduled to a particular nodes with matching taints. Each component can overwrite
+  # these default values by adding its tolerations block in the relevant section below
+  # and setting the desired values.
+  # Configure this field in case that all pods of Istio control plane are expected to
+  # be scheduled to particular nodes with specified taints.
+  defaultTolerations: []
+
   # Whether to perform server-side validation of configuration.
   configValidation: true
 
@@ -483,7 +491,7 @@ global:
 
   nodeAgent:
     repository: rancher/istio-node-agent-k8s
-    tag: "1.2.0"
+    tag: "1.2.4"
   sds:
     # SDS enabled. IF set to true, mTLS certificates for the sidecars will be
     # distributed through the SecretDiscoveryService instead of using K8S secrets to mount the certificates.