diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 5680eae..e9eb39a 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 1.6.3
+version: 1.6.4
 appVersion: v1.4.2
 icon: https://raw.githubusercontent.com/kafbat/kafka-ui/main/documentation/images/logo_new.png
diff --git a/charts/kafka-ui/templates/deployment.yaml b/charts/kafka-ui/templates/deployment.yaml
index 82a61b3..317e09b 100644
--- a/charts/kafka-ui/templates/deployment.yaml
+++ b/charts/kafka-ui/templates/deployment.yaml
@@ -64,34 +64,34 @@ spec:
               {{- if .Values.yamlApplicationConfig }}
               value: /kafka-ui/config.yml
               {{- else if .Values.yamlApplicationConfigConfigMap }}
-              value: /kafka-ui/{{ .Values.yamlApplicationConfigConfigMap.keyName | default "config.yml" }}
+              value: /kafka-ui/{{ tpl (default "config.yml" .Values.yamlApplicationConfigConfigMap.keyName) . }}
               {{- else if .Values.yamlApplicationConfigSecret }}
-              value: /kafka-ui/{{ .Values.yamlApplicationConfigSecret.keyName | default "config.yml" }}
+              value: /kafka-ui/{{ tpl (default "config.yml" .Values.yamlApplicationConfigSecret.keyName) . }}
               {{- end }}
             {{- end }}
             {{- with .Values.env }}
-              {{- toYaml . | nindent 12 }}
+              {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end }}
             {{- range $key, $value := .Values.envs.secretMappings }}
             - name: {{ $key }}
               valueFrom:
                 secretKeyRef:
-                  name: {{ required "Missing required value envs.secretMappings.[].name" $value.name }}
-                  key: {{ required "Missing required value envs.secretMappings.[].keyName"  $value.keyName }}
+                  name: {{ tpl (required "Missing required value envs.secretMappings.[].name" $value.name) $ | quote }}
+                  key: {{ tpl (required "Missing required value envs.secretMappings.[].keyName" $value.keyName) $ | quote }}
             {{- end }}
             {{- range $key, $value := .Values.envs.configMappings }}
             - name: {{ $key }}
               valueFrom:
                 configMapKeyRef:
-                  name: {{ required "Missing required value envs.configMappings.[].name" $value.name }}
-                  key: {{ required "Missing required value envs.configMappings.[].keyName"  $value.keyName }}
+                  name: {{ tpl (required "Missing required value envs.configMappings.[].name" $value.name) $ | quote }}
+                  key: {{ tpl (required "Missing required value envs.configMappings.[].keyName"  $value.keyName) $ | quote }}
             {{- end }}
           {{- end }}
           {{- if or .Values.existingConfigMap .Values.envs.config .Values.existingSecret .Values.envs.secret }}
           envFrom:
             {{- if .Values.existingConfigMap }}
             - configMapRef:
-                name: {{ .Values.existingConfigMap }}
+                name: {{ tpl .Values.existingConfigMap . | quote }}
             {{- end }}
             {{- if .Values.envs.config }}
             - configMapRef:
@@ -99,7 +99,7 @@ spec:
             {{- end }}
             {{- if .Values.existingSecret }}
             - secretRef:
-                name: {{ .Values.existingSecret }}
+                name: {{ tpl .Values.existingSecret . | quote }}
             {{- end }}
             {{- if .Values.envs.secret}}
             - secretRef:
@@ -141,8 +141,8 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- if or .Values.yamlApplicationConfig .Values.volumeMounts .Values.yamlApplicationConfigConfigMap .Values.yamlApplicationConfigSecret }}
           volumeMounts:
-            {{- with .Values.volumeMounts }} 
-              {{- toYaml . | nindent 12 }}
+            {{- with .Values.volumeMounts }}
+              {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end }}
             {{- if .Values.yamlApplicationConfig }}
             - name: kafka-ui-yaml-conf
@@ -163,22 +163,22 @@ spec:
       {{- if or .Values.yamlApplicationConfig .Values.volumes .Values.yamlApplicationConfigConfigMap .Values.yamlApplicationConfigSecret }}
       volumes:
         {{- with .Values.volumes }}
-          {{- toYaml . | nindent 8 }}
+          {{- tpl (toYaml .) $ | nindent 8 }}
         {{- end }}
         {{- if .Values.yamlApplicationConfig }}
         - name: kafka-ui-yaml-conf
-          configMap: 
+          configMap:
             name: {{ include "kafka-ui.fullname" . }}-fromvalues
         {{- end }}
         {{- if .Values.yamlApplicationConfigConfigMap}}
         - name: kafka-ui-yaml-conf-configmap
-          configMap: 
-            name: {{ .Values.yamlApplicationConfigConfigMap.name }}
+          configMap:
+            name: {{ tpl (required "Missing required value yamlApplicationConfigConfigMap/name" .Values.yamlApplicationConfigConfigMap.name) . | quote }}
         {{- end }}
         {{- if .Values.yamlApplicationConfigSecret}}
         - name: kafka-ui-yaml-conf-secret
           secret:
-            secretName: {{ .Values.yamlApplicationConfigSecret.name }}
+            secretName: {{ tpl (required "Missing required value yamlApplicationConfigSecret/name" .Values.yamlApplicationConfigSecret.name) . | quote }}
         {{- end }}
       {{- end }}
       {{- with .Values.nodeSelector }}
diff --git a/charts/kafka-ui/templates/ingress.yaml b/charts/kafka-ui/templates/ingress.yaml
index 5a17937..7f18cc3 100644
--- a/charts/kafka-ui/templates/ingress.yaml
+++ b/charts/kafka-ui/templates/ingress.yaml
@@ -27,7 +27,7 @@ spec:
   {{- if .Values.ingress.tls.enabled }}
   tls:
     - hosts:
-        - {{ tpl .Values.ingress.host . }}
+        - {{ tpl .Values.ingress.host . | quote }}
       secretName: {{ .Values.ingress.tls.secretName }}
   {{- end }}
   {{- if .Values.ingress.ingressClassName }}
@@ -70,7 +70,7 @@ spec:
                   number: {{ .servicePort }}
           {{- end }}
 {{- if tpl .Values.ingress.host . }}
-      host: {{tpl .Values.ingress.host . }}
+      host: {{ tpl .Values.ingress.host . | quote }}
 {{- end }}
 {{- else -}}
           {{- range .Values.ingress.precedingPaths }}
@@ -92,7 +92,7 @@ spec:
               servicePort: {{ .servicePort }}
           {{- end }}
 {{- if tpl .Values.ingress.host . }}
-      host: {{ tpl .Values.ingress.host . }}
+      host: {{ tpl .Values.ingress.host . | quote }}
 {{- end }}
 {{- end }}
 {{- end }}