diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index 7e057602..554e09df 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: grafana
-version: 1.2.0
-appVersion: 5.4.3
+version: 1.3.0
+appVersion: 6.2.5
 description: Grafana dashboards for monitoring Flagger canary deployments
 icon: https://raw.githubusercontent.com/weaveworks/flagger/master/docs/logo/flagger-icon.png
 home: https://flagger.app
diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
index d6a4a3f5..5b4ad8c4 100644
--- a/charts/grafana/values.yaml
+++ b/charts/grafana/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: grafana/grafana
-  tag: 5.4.3
+  tag: 6.2.5
   pullPolicy: IfNotPresent
 
 service:
diff --git a/charts/podinfo/Chart.yaml b/charts/podinfo/Chart.yaml
index eda7dc66..075936f3 100644
--- a/charts/podinfo/Chart.yaml
+++ b/charts/podinfo/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 2.1.0
+version: 2.2.0
 appVersion: 1.4.0
 name: podinfo
 engine: gotpl
diff --git a/charts/podinfo/templates/canary.yaml b/charts/podinfo/templates/canary.yaml
index 08107f7f..c1176a17 100644
--- a/charts/podinfo/templates/canary.yaml
+++ b/charts/podinfo/templates/canary.yaml
@@ -26,6 +26,9 @@ spec:
     hosts:
     - {{ .Values.canary.istioIngress.host }}
     {{- end }}
+    trafficPolicy:
+      tls:
+        mode: {{ .Values.canary.istioTLS }}
   canaryAnalysis:
     interval: {{ .Values.canary.analysis.interval }}
     threshold: {{ .Values.canary.analysis.threshold }}
diff --git a/charts/podinfo/values.yaml b/charts/podinfo/values.yaml
index b1af8b6f..deff5c3d 100644
--- a/charts/podinfo/values.yaml
+++ b/charts/podinfo/values.yaml
@@ -17,6 +17,8 @@ hpa:
 
 canary:
   enabled: true
+  # Istio traffic policy tls can be DISABLE or ISTIO_MUTUAL
+  istioTLS: DISABLE
   istioIngress:
     enabled: false
     # Istio ingress gateway name
diff --git a/test/e2e-kind.sh b/test/e2e-kind.sh
index 63458446..05b13334 100755
--- a/test/e2e-kind.sh
+++ b/test/e2e-kind.sh
@@ -3,7 +3,7 @@
 set -o errexit
 
 REPO_ROOT=$(git rev-parse --show-toplevel)
-KIND_VERSION=v0.3.0
+KIND_VERSION=v0.4.0
 
 if [[ "$1" ]]; then
   KIND_VERSION=$1