diff --git a/charts/steadybit-extension-istio/Chart.yaml b/charts/steadybit-extension-istio/Chart.yaml
index 4616331..8042a24 100644
--- a/charts/steadybit-extension-istio/Chart.yaml
+++ b/charts/steadybit-extension-istio/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: steadybit-extension-istio
 description: Steadybit Istio extension Helm chart for Kubernetes.
-version: 1.1.16
+version: 1.1.17
 appVersion: v1.0.18
 home: https://www.steadybit.com/
 icon: https://steadybit-website-assets.s3.amazonaws.com/logo-symbol-transparent.png
diff --git a/charts/steadybit-extension-istio/templates/deployment.yaml b/charts/steadybit-extension-istio/templates/deployment.yaml
index dfdb74e..37f02d5 100644
--- a/charts/steadybit-extension-istio/templates/deployment.yaml
+++ b/charts/steadybit-extension-istio/templates/deployment.yaml
@@ -56,8 +56,10 @@ spec:
               cpu: {{ .Values.resources.limits.cpu }}
           env:
             {{- include "extensionlib.deployment.env" (list .) | nindent 12 }}
+            {{- with (.Values.kubernetes.clusterName | default (dig "clusterName" nil (.Values.global | default dict))) }}
             - name: STEADYBIT_EXTENSION_CLUSTER_NAME
-              value:  {{ if and .Values.global .Values.global.clusterName }}{{ .Values.global.clusterName | quote }}{{ else }}{{ .Values.kubernetes.clusterName }}{{ end }}
+              value: {{ . | quote }}
+            {{- end }}
             {{- if .Values.discovery.attributes.excludes.virtualService }}
             - name: STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTES_EXCLUDES_VIRTUAL_SERVICE
               value: {{ join "," .Values.discovery.attributes.excludes.virtualService | quote }}
diff --git a/charts/steadybit-extension-istio/tests/__snapshot__/deployment_test.yaml.snap b/charts/steadybit-extension-istio/tests/__snapshot__/deployment_test.yaml.snap
index 62c4cb5..d3707cd 100644
--- a/charts/steadybit-extension-istio/tests/__snapshot__/deployment_test.yaml.snap
+++ b/charts/steadybit-extension-istio/tests/__snapshot__/deployment_test.yaml.snap
@@ -193,8 +193,6 @@ manifest should match snapshot with extra env vars:
                   value: INFO
                 - name: STEADYBIT_LOG_FORMAT
                   value: text
-                - name: STEADYBIT_EXTENSION_CLUSTER_NAME
-                  value: null
                 - name: FOO
                   value: bar
               envFrom:
@@ -277,8 +275,6 @@ manifest should match snapshot with extra labels:
                   value: INFO
                 - name: STEADYBIT_LOG_FORMAT
                   value: text
-                - name: STEADYBIT_EXTENSION_CLUSTER_NAME
-                  value: null
               image: ghcr.io/steadybit/extension-istio:v0.0.0
               imagePullPolicy: IfNotPresent
               livenessProbe:
@@ -453,8 +449,6 @@ manifest should match snapshot with mutual TLS using containerPaths:
                   value: /etc/tls/server.key
                 - name: STEADYBIT_EXTENSION_TLS_CLIENT_CAS
                   value: /etc/tls/ca.crt,/etc/tls/ca2.crt
-                - name: STEADYBIT_EXTENSION_CLUSTER_NAME
-                  value: null
               image: ghcr.io/steadybit/extension-istio:v0.0.0
               imagePullPolicy: IfNotPresent
               livenessProbe:
@@ -528,8 +522,6 @@ manifest should match snapshot with podSecurityContext:
                   value: INFO
                 - name: STEADYBIT_LOG_FORMAT
                   value: text
-                - name: STEADYBIT_EXTENSION_CLUSTER_NAME
-                  value: null
               image: ghcr.io/steadybit/extension-istio:v0.0.0
               imagePullPolicy: IfNotPresent
               livenessProbe:
@@ -604,8 +596,6 @@ manifest should match snapshot with priority class:
                   value: INFO
                 - name: STEADYBIT_LOG_FORMAT
                   value: text
-                - name: STEADYBIT_EXTENSION_CLUSTER_NAME
-                  value: null
               image: ghcr.io/steadybit/extension-istio:v0.0.0
               imagePullPolicy: IfNotPresent
               livenessProbe: