diff --git a/charts/fluentd/templates/_helpers.tpl b/charts/fluentd/templates/_helpers.tpl
index 1b1bf702..91a3bdf2 100644
--- a/charts/fluentd/templates/_helpers.tpl
+++ b/charts/fluentd/templates/_helpers.tpl
@@ -101,4 +101,4 @@ autoscaling/v2beta2
 {{- else -}}
 autoscaling/v2
 {{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/charts/fluentd/templates/daemonset.yaml b/charts/fluentd/templates/daemonset.yaml
index 1fb6f761..a17bdd68 100644
--- a/charts/fluentd/templates/daemonset.yaml
+++ b/charts/fluentd/templates/daemonset.yaml
@@ -27,8 +27,8 @@ spec:
     metadata:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/fluentd-configurations-cm.yaml") . | sha256sum }}
-        {{- with .Values.podAnnotations }}
-          {{- toYaml . | nindent 8 }}
+        {{- range $k, $v := .Values.podAnnotations }}
+        {{ $k }}: {{ tpl ($v | toString) $ | quote }}
         {{- end }}
       labels:
         {{- include "fluentd.selectorLabels" . | nindent 8 }}