diff --git a/config/charts/inferencepool/templates/epp-deployment.yaml b/config/charts/inferencepool/templates/epp-deployment.yaml
index b58c3b782..f6c3051ef 100644
--- a/config/charts/inferencepool/templates/epp-deployment.yaml
+++ b/config/charts/inferencepool/templates/epp-deployment.yaml
@@ -38,32 +38,32 @@ spec:
         {{- with .Values.inferenceExtension.sidecar.args }}
         args:
           {{- range . }}
-            - {{ tpl . $ | quote }}
+            - {{ . | quote }}
           {{- end }}
         {{- end }}
         {{- with .Values.inferenceExtension.sidecar.env }}
         env:
-          {{- toYaml . | nindent 10 }}
+          {{- . | toYaml | nindent 10 }}
           {{- end }}
         {{- with .Values.inferenceExtension.sidecar.ports }}
         ports:
-          {{- toYaml . | nindent 10 }}
+          {{- . | toYaml | nindent 10 }}
         {{- end }}
         {{- with .Values.inferenceExtension.sidecar.livenessProbe }}
         livenessProbe:
-          {{- toYaml . | nindent 10 }}
+          {{- . | toYaml | nindent 10 }}
         {{- end }}
         {{- with .Values.inferenceExtension.sidecar.readinessProbe }}
         readinessProbe:
-          {{- toYaml . | nindent 10 }}
+          {{- . | toYaml | nindent 10 }}
         {{- end }}
         {{- with .Values.inferenceExtension.sidecar.resources }}
         resources:
-          {{- toYaml . | nindent 10 }}
+          {{- . | toYaml | nindent 10 }}
         {{- end }}
         {{- with .Values.inferenceExtension.sidecar.volumeMounts }}
         volumeMounts:
-          {{- toYaml . | nindent 10 }}
+          {{- . | toYaml | nindent 10 }}
         {{- end }}
         {{- end }}
       - name: epp
@@ -117,7 +117,7 @@ spec:
         - name: metrics
           containerPort: 9090
         {{- if .Values.inferenceExtension.extraContainerPorts }}
-        {{- toYaml .Values.inferenceExtension.extraContainerPorts | nindent 8 }}
+        {{- .Values.inferenceExtension.extraContainerPorts | toYaml | nindent 8 }}
         {{- end }}
         livenessProbe:
           {{- if gt (.Values.inferenceExtension.replicas | int) 1 }}
@@ -177,21 +177,21 @@ spec:
           value: {{ .Values.inferenceExtension.tracing.sampling.samplerArg | quote }}
         {{- end }}
         {{- if .Values.inferenceExtension.env }}
-        {{- toYaml .Values.inferenceExtension.env | nindent 8 }}
+        {{- .Values.inferenceExtension.env | toYaml | nindent 8 }}
         {{- end }}
         volumeMounts:
         - name: plugins-config-volume
           mountPath: "/config"
         {{- if .Values.inferenceExtension.volumeMounts }}
-        {{- toYaml .Values.inferenceExtension.volumeMounts | nindent 8 }}
+        {{- .Values.inferenceExtension.volumeMounts | toYaml | nindent 8 }}
         {{- end }}
       {{- include "gateway-api-inference-extension.latencyPredictor.containers" . | nindent 6 }}
       volumes:
       {{- if .Values.inferenceExtension.volumes }}
-      {{- toYaml .Values.inferenceExtension.volumes | nindent 6 }}
+      {{- .Values.inferenceExtension.volumes | toYaml | nindent 6 }}
       {{- end }}
       {{- if .Values.inferenceExtension.sidecar.volumes }}
-      {{- tpl (toYaml .Values.inferenceExtension.sidecar.volumes) $ | nindent 6 }}
+      {{- .Values.inferenceExtension.sidecar.volumes | toYaml | nindent 6 }}
       {{- end }}
       - name: plugins-config-volume
         configMap:
@@ -199,9 +199,9 @@ spec:
       {{- include "gateway-api-inference-extension.latencyPredictor.volumes" . | nindent 6 }}
       {{- if .Values.inferenceExtension.affinity }}
       affinity:
-        {{- toYaml .Values.inferenceExtension.affinity | nindent 8 }}
+        {{- .Values.inferenceExtension.affinity | toYaml | nindent 8 }}
       {{- end }}
       {{- if .Values.inferenceExtension.tolerations }}
       tolerations:
-        {{- toYaml .Values.inferenceExtension.tolerations | nindent 8 }}
+        {{- .Values.inferenceExtension.tolerations | toYaml | nindent 8 }}
       {{- end }}
diff --git a/config/charts/inferencepool/templates/epp-service.yaml b/config/charts/inferencepool/templates/epp-service.yaml
index b1a48df91..2d476e182 100644
--- a/config/charts/inferencepool/templates/epp-service.yaml
+++ b/config/charts/inferencepool/templates/epp-service.yaml
@@ -16,6 +16,6 @@ spec:
       protocol: TCP
       port: {{ .Values.inferenceExtension.metricsPort | default 9090 }}
     {{- with .Values.inferenceExtension.extraServicePorts }}
-    {{- toYaml . | nindent 4 }}
+    {{- . | toYaml | nindent 4 }}
     {{- end }}
   type: ClusterIP
diff --git a/config/charts/inferencepool/templates/epp-servicemonitor.yaml b/config/charts/inferencepool/templates/epp-servicemonitor.yaml
index 220be76dc..d58662cbe 100644
--- a/config/charts/inferencepool/templates/epp-servicemonitor.yaml
+++ b/config/charts/inferencepool/templates/epp-servicemonitor.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     {{- include "gateway-api-inference-extension.labels" . | nindent 4 }}
     {{- with .Values.inferenceExtension.monitoring.prometheus.extraLabels }}
-    {{- toYaml . | nindent 4 }}
+    {{- . | toYaml | nindent 4 }}
     {{- end }}
 spec:
   endpoints:
diff --git a/config/charts/inferencepool/templates/istio.yaml b/config/charts/inferencepool/templates/istio.yaml
index a0f9c8d8c..140d7e327 100644
--- a/config/charts/inferencepool/templates/istio.yaml
+++ b/config/charts/inferencepool/templates/istio.yaml
@@ -17,6 +17,6 @@ spec:
       insecureSkipVerify: true
     {{- with (index (index $dr "trafficPolicy") "connectionPool") }}
     connectionPool:
-      {{- toYaml . | nindent 6 }}
+      {{- . | toYaml | nindent 6 }}
     {{- end }}
 {{- end }}