diff --git a/charts/pulsar/templates/pulsar-manager-deployment.yaml b/charts/pulsar/templates/pulsar-manager-deployment.yaml
index fd09871..11290e5 100644
--- a/charts/pulsar/templates/pulsar-manager-deployment.yaml
+++ b/charts/pulsar/templates/pulsar-manager-deployment.yaml
@@ -41,7 +41,9 @@ spec:
         {{- if .Values.pulsar_manager.restartPodsOnConfigMapChange }}
         checksum/config: {{ include (print $.Template.BasePath "/pulsar-manager-configmap.yaml") . | sha256sum }}
         {{- end }}
-{{ toYaml .Values.pulsar_manager.annotations | indent 8 }}
+{{- with .Values.pulsar_manager.annotations }}
+{{ toYaml . | indent 8 }}
+{{- end }}
     spec:
     {{- if .Values.pulsar_manager.nodeSelector }}
       nodeSelector:
diff --git a/charts/pulsar/templates/toolset-statefulset.yaml b/charts/pulsar/templates/toolset-statefulset.yaml
index e87c634..7861b69 100644
--- a/charts/pulsar/templates/toolset-statefulset.yaml
+++ b/charts/pulsar/templates/toolset-statefulset.yaml
@@ -45,7 +45,9 @@ spec:
         {{- if .Values.toolset.restartPodsOnConfigMapChange }}
         checksum/config: {{ include (print $.Template.BasePath "/toolset-configmap.yaml") . | sha256sum }}
         {{- end }}
-{{ toYaml .Values.toolset.annotations | indent 8 }}
+{{- with .Values.toolset.annotations }}
+{{ toYaml . | indent 8 }}
+{{- end }}
     spec:
     {{- if .Values.toolset.nodeSelector }}
       nodeSelector: