diff --git a/charts/sn-platform-slim/templates/_helpers.tpl b/charts/sn-platform-slim/templates/_helpers.tpl
index 20dd6d44e..55ed3faa2 100644
--- a/charts/sn-platform-slim/templates/_helpers.tpl
+++ b/charts/sn-platform-slim/templates/_helpers.tpl
@@ -71,6 +71,8 @@ cluster: {{ template "pulsar.fullname" . }}
 {{- if .Values.istio.enabled }}
 {{- if .Values.istio.labels }}
 {{ toYaml .Values.istio.labels }}
+{{- else if eq (default "" .Values.istio.dataplaneMode) "ambient" }}
+istio.io/dataplane-mode: "ambient"
 {{- else }}
 sidecar.istio.io/inject: "true"
 {{- end }}
diff --git a/charts/sn-platform-slim/templates/broker/broker-cluster.yaml b/charts/sn-platform-slim/templates/broker/broker-cluster.yaml
index af40c2207..cfe06fa4c 100644
--- a/charts/sn-platform-slim/templates/broker/broker-cluster.yaml
+++ b/charts/sn-platform-slim/templates/broker/broker-cluster.yaml
@@ -167,7 +167,7 @@ spec:
     certSecretName: "{{ template "pulsar.broker.tls.secret.name" . }}"
     trustCertsEnabled: {{ .Values.tls.broker.trustCertsEnabled }}
   {{- end }}
-  {{- if and .Values.istio.enabled .Values.ingress.broker.enabled }}
+  {{- if .Values.istio.enabled }}
   istio:
     enabled: true
     {{- if .Values.istio.dataplaneMode }}
@@ -177,6 +177,7 @@ spec:
     mtls:
       mode: permissive
     {{- end }}
+    {{- if .Values.ingress.broker.enabled }}
     gateway:
       selector:
 {{- include "pulsar.istio.gateway.selector" . | indent 8 }}
@@ -189,6 +190,7 @@ spec:
         trustCertsEnabled: {{ .Values.tls.broker.gateway.trustCertsEnabled }}
         mode: "passthrough"
       {{- end }}
+    {{- end }}
   {{- end }}
   {{- if and .Values.broker.pulsarBroker.networking .Values.broker.pulsarBroker.networking.podService .Values.broker.pulsarBroker.networking.podService.enabled }}
   networking: