diff --git a/charts/argocd-notifications/templates/bots/slack/serviceaccount.yaml b/charts/argocd-notifications/templates/bots/slack/serviceaccount.yaml
index 3f2529cb..f888811c 100644
--- a/charts/argocd-notifications/templates/bots/slack/serviceaccount.yaml
+++ b/charts/argocd-notifications/templates/bots/slack/serviceaccount.yaml
@@ -5,8 +5,8 @@ metadata:
   name: {{ include "argocd-notifications.bots.slack.serviceAccountName" . }}
   labels:
     {{- include "argocd-notifications.bots.slack.labels" . | nindent 4 }}
-  {{- if .Values.bots.slack.serviceAccount.annotations }}
+  {{- with .Values.bots.slack.serviceAccount.annotations }}
   annotations:
-    {{- toYaml .Values.bots.slack.serviceAccount.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
   {{ end }}
 {{ end }}
diff --git a/charts/argocd-notifications/templates/serviceaccount.yaml b/charts/argocd-notifications/templates/serviceaccount.yaml
index 1caa9b77..418b6800 100644
--- a/charts/argocd-notifications/templates/serviceaccount.yaml
+++ b/charts/argocd-notifications/templates/serviceaccount.yaml
@@ -5,8 +5,8 @@ metadata:
   name: {{ include "argocd-notifications.serviceAccountName" . }}
   labels:
     {{- include "argocd-notifications.labels" . | nindent 4 }}
-  {{- if .Values.serviceAccount.annotations }}
+  {{- with .Values.serviceAccount.annotations }}
   annotations:
-    {{- toYaml .Values.serviceAccount.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 {{- end }}