diff --git a/charts/kubezero-istio-ingress/Chart.yaml b/charts/kubezero-istio-ingress/Chart.yaml
index 57bd0af..aff9a4b 100644
--- a/charts/kubezero-istio-ingress/Chart.yaml
+++ b/charts/kubezero-istio-ingress/Chart.yaml
@@ -2,23 +2,25 @@ apiVersion: v2
 name: kubezero-istio-ingress
 description: KubeZero Umbrella Chart for Istio based Ingress
 type: application
-version: 0.7.5
-appVersion: 1.11.3
+version: 0.7.6
+appVersion: 1.11.5
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
   - kubezero
   - istio
+  - ingress
 maintainers:
-  - name: Quarky9
+  - name: Stefan Reimer
+    email: stefan@zero-downtime.net
 dependencies:
   - name: kubezero-lib
     version: ">= 0.1.4"
     repository: https://cdn.zero-downtime.net/charts/
   - name: istio-ingress
-    version: 1.11.3
+    version: 1.11.5
     condition: istio-ingress.enabled
   - name: istio-private-ingress
-    version: 1.11.3
+    version: 1.11.5
     condition: istio-private-ingress.enabled
-kubeVersion: ">= 1.18.0"
+kubeVersion: ">= 1.20.0"
diff --git a/charts/kubezero-istio-ingress/charts/istio-ingress/Chart.yaml b/charts/kubezero-istio-ingress/charts/istio-ingress/Chart.yaml
index dc40663..36126fe 100644
--- a/charts/kubezero-istio-ingress/charts/istio-ingress/Chart.yaml
+++ b/charts/kubezero-istio-ingress/charts/istio-ingress/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: istio-ingress
-version: 1.11.3
+version: 1.11.5
 tillerVersion: ">=2.7.2"
 description: Helm chart for deploying Istio gateways
 keywords:
diff --git a/charts/kubezero-istio-ingress/charts/istio-ingress/values.yaml b/charts/kubezero-istio-ingress/charts/istio-ingress/values.yaml
index 8a0c415..ab5a0da 100644
--- a/charts/kubezero-istio-ingress/charts/istio-ingress/values.yaml
+++ b/charts/kubezero-istio-ingress/charts/istio-ingress/values.yaml
@@ -169,7 +169,7 @@ global:
   hub: docker.io/istio
 
   # Default tag for Istio images.
-  tag: 1.11.3
+  tag: 1.11.5
 
   # Specify image pull policy if default behavior isn't desired.
   # Default behavior: latest images will be Always else IfNotPresent.
diff --git a/charts/kubezero-istio-ingress/charts/istio-private-ingress/Chart.yaml b/charts/kubezero-istio-ingress/charts/istio-private-ingress/Chart.yaml
index 52f2644..4b132cb 100644
--- a/charts/kubezero-istio-ingress/charts/istio-private-ingress/Chart.yaml
+++ b/charts/kubezero-istio-ingress/charts/istio-private-ingress/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: istio-private-ingress
-version: 1.11.3
+version: 1.11.5
 tillerVersion: ">=2.7.2"
 description: Helm chart for deploying Istio gateways
 keywords:
diff --git a/charts/kubezero-istio-ingress/charts/istio-private-ingress/values.yaml b/charts/kubezero-istio-ingress/charts/istio-private-ingress/values.yaml
index 8a0c415..ab5a0da 100644
--- a/charts/kubezero-istio-ingress/charts/istio-private-ingress/values.yaml
+++ b/charts/kubezero-istio-ingress/charts/istio-private-ingress/values.yaml
@@ -169,7 +169,7 @@ global:
   hub: docker.io/istio
 
   # Default tag for Istio images.
-  tag: 1.11.3
+  tag: 1.11.5
 
   # Specify image pull policy if default behavior isn't desired.
   # Default behavior: latest images will be Always else IfNotPresent.
diff --git a/charts/kubezero-istio-ingress/values.yaml b/charts/kubezero-istio-ingress/values.yaml
index 062331a..8c575e1 100644
--- a/charts/kubezero-istio-ingress/values.yaml
+++ b/charts/kubezero-istio-ingress/values.yaml
@@ -1,7 +1,7 @@
 # Make sure these values match kuberzero-istio !!!
 global:
   #hub: docker.io/istio
-  #tag: 1.11.0
+  tag: 1.11.5-distroless
 
   logAsJson: true
 
diff --git a/charts/kubezero-istio/Chart.yaml b/charts/kubezero-istio/Chart.yaml
index caa4208..e7547d4 100644
--- a/charts/kubezero-istio/Chart.yaml
+++ b/charts/kubezero-istio/Chart.yaml
@@ -2,25 +2,26 @@ apiVersion: v2
 name: kubezero-istio
 description: KubeZero Umbrella Chart for Istio
 type: application
-version: 0.7.5
-appVersion: 1.11.3
+version: 0.7.6
+appVersion: 1.11.5
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
   - kubezero
   - istio
 maintainers:
-  - name: Quarky9
+  - name: Stefan Reimer
+    email: stefan@zero-downtime.net
 dependencies:
   - name: kubezero-lib
     version: ">= 0.1.4"
     repository: https://cdn.zero-downtime.net/charts/
   - name: base
-    version: 1.11.3
+    version: 1.11.5
   - name: istio-discovery
-    version: 1.11.3
+    version: 1.11.5
   - name: kiali-server
     version: 1.38.1
     # repository: https://github.com/kiali/helm-charts/tree/master/docs
     condition: kiali-server.enabled
-kubeVersion: ">= 1.18.0"
+kubeVersion: ">= 1.20.0"
diff --git a/charts/kubezero-istio/charts/base/Chart.yaml b/charts/kubezero-istio/charts/base/Chart.yaml
index afdde2b..63655dc 100644
--- a/charts/kubezero-istio/charts/base/Chart.yaml
+++ b/charts/kubezero-istio/charts/base/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: base
-version: 1.11.3
+version: 1.11.5
 tillerVersion: ">=2.7.2"
 description: Helm chart for deploying Istio cluster resources and CRDs
 keywords:
diff --git a/charts/kubezero-istio/charts/istio-discovery/Chart.yaml b/charts/kubezero-istio/charts/istio-discovery/Chart.yaml
index 6ed08a8..74c4c07 100644
--- a/charts/kubezero-istio/charts/istio-discovery/Chart.yaml
+++ b/charts/kubezero-istio/charts/istio-discovery/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: istio-discovery
-version: 1.11.3
+version: 1.11.5
 tillerVersion: ">=2.7.2"
 description: Helm chart for istio control plane
 keywords:
diff --git a/charts/kubezero-istio/charts/istio-discovery/templates/deployment.yaml b/charts/kubezero-istio/charts/istio-discovery/templates/deployment.yaml
index 6e0320e..27987ce 100644
--- a/charts/kubezero-istio/charts/istio-discovery/templates/deployment.yaml
+++ b/charts/kubezero-istio/charts/istio-discovery/templates/deployment.yaml
@@ -54,14 +54,16 @@ spec:
 {{ toYaml .Values.pilot.podAnnotations | indent 8 }}
         {{- end }}
     spec:
+{{- if .Values.pilot.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.pilot.nodeSelector | indent 8 }}
+{{- end }}
       serviceAccountName: istiod{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }}
 {{- if .Values.global.priorityClassName }}
       priorityClassName: "{{ .Values.global.priorityClassName }}"
 {{- end }}
       securityContext:
         fsGroup: 1337
-      nodeSelector:
-        node-role.kubernetes.io/control-plane: ""
       tolerations:
       - effect: NoSchedule
         key: node-role.kubernetes.io/master
diff --git a/charts/kubezero-istio/charts/istio-discovery/values.yaml b/charts/kubezero-istio/charts/istio-discovery/values.yaml
index a4ea2a5..a7f42cc 100644
--- a/charts/kubezero-istio/charts/istio-discovery/values.yaml
+++ b/charts/kubezero-istio/charts/istio-discovery/values.yaml
@@ -239,7 +239,7 @@ global:
   # Dev builds from prow are on gcr.io
   hub: docker.io/istio
   # Default tag for Istio images.
-  tag: 1.11.3
+  tag: 1.11.5
 
   # Specify image pull policy if default behavior isn't desired.
   # Default behavior: latest images will be Always else IfNotPresent.
diff --git a/charts/kubezero-istio/templates/grafana-dashboards.yaml b/charts/kubezero-istio/templates/grafana-dashboards.yaml
index 5bcc608..1e63b28 100644
--- a/charts/kubezero-istio/templates/grafana-dashboards.yaml
+++ b/charts/kubezero-istio/templates/grafana-dashboards.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     grafana_dashboard: "1"
-{{ include "kubezero-lib.labels" . | indent 4 }}
+    {{- include "kubezero-lib.labels" . | nindent 4 }}
   annotations:
     k8s-sidecar-target-directory: Istio
 binaryData:
diff --git a/charts/kubezero-istio/values.yaml b/charts/kubezero-istio/values.yaml
index 532d8c7..71f678b 100644
--- a/charts/kubezero-istio/values.yaml
+++ b/charts/kubezero-istio/values.yaml
@@ -1,6 +1,6 @@
 global:
   # hub: docker.io/istio
-  # tag: 1.11.0
+  tag: 1.11.5-distroless
 
   logAsJson: true
 
@@ -14,9 +14,10 @@ istio-discovery:
     autoscaleEnabled: false
     replicaCount: 1
 
-    # Not implemented, monkey patched in the chart itself
     nodeSelector:
       node-role.kubernetes.io/control-plane: ""
+
+    # Not implemented, monkey patched in the chart itself
     tolerations:
     - effect: NoSchedule
       key: node-role.kubernetes.io/master
diff --git a/charts/kubezero-istio/zdt.patch b/charts/kubezero-istio/zdt.patch
index 6fcf246..03169f1 100644
--- a/charts/kubezero-istio/zdt.patch
+++ b/charts/kubezero-istio/zdt.patch
@@ -68,12 +68,10 @@ diff -tubr istio/manifests/charts/gateways/istio-ingress/templates/service.yaml
 diff -tubr istio/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml istio.zdt/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml
 --- istio/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml	2021-07-15 07:32:30.000000000 +0200
 +++ istio.zdt/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml	2021-08-10 15:46:23.216421660 +0200
-@@ -60,6 +60,11 @@
+@@ -60,6 +60,9 @@
  {{- end }}
        securityContext:
          fsGroup: 1337
-+      nodeSelector:
-+        node-role.kubernetes.io/control-plane: ""
 +      tolerations:
 +      - effect: NoSchedule
 +        key: node-role.kubernetes.io/master
diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index 4d9e16f..0643064 100644
--- a/charts/kubezero/Chart.yaml
+++ b/charts/kubezero/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero
 description: KubeZero - Root App of Apps chart
 type: application
-version: 1.21.7-7
+version: 1.21.7-8
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml
index 82cbc3e..6c9bb1f 100644
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@@ -32,12 +32,12 @@ storage:
 istio:
   enabled: false
   namespace: istio-system
-  targetRevision: 0.7.5
+  targetRevision: 0.7.6
 
 istio-ingress:
   enabled: false
   namespace: istio-ingress
-  targetRevision: 0.7.5
+  targetRevision: 0.7.6
 
 metrics:
   enabled: false