diff --git a/charts/argo-events/ci/test-values.yaml b/charts/argo-events/ci/test-values.yaml
new file mode 100644
index 00000000..cd5d3916
--- /dev/null
+++ b/charts/argo-events/ci/test-values.yaml
@@ -0,0 +1,6 @@
+serviceAccount: argo-events-sa-test
+additionalSaNamespaces:
+  - nsone
+  - nstwo
+instanceID: test-argo-events
+singleNamespace: false
diff --git a/charts/argo-events/templates/argo-events-cluster-roles.yaml b/charts/argo-events/templates/argo-events-cluster-roles.yaml
index 0e508f36..878b8520 100644
--- a/charts/argo-events/templates/argo-events-cluster-roles.yaml
+++ b/charts/argo-events/templates/argo-events-cluster-roles.yaml
@@ -11,9 +11,10 @@ subjects:
     name: {{ .Values.serviceAccount }}
     namespace: {{ .Release.Namespace }}
   {{- if .Values.additionalSaNamespaces }}
+  {{ $sa := .Values.serviceAccount }}
   {{- range $namespace := .Values.additionalSaNamespaces }}
   - kind: ServiceAccount
-    name: {{ .Values.serviceAccount }}
+    name: {{ $sa }}
     namespace: {{ $namespace }}
   {{- end }}
   {{- end }}
diff --git a/charts/argo-events/templates/argo-events-sa.yaml b/charts/argo-events/templates/argo-events-sa.yaml
index 04a39f51..f13b8a1d 100644
--- a/charts/argo-events/templates/argo-events-sa.yaml
+++ b/charts/argo-events/templates/argo-events-sa.yaml
@@ -1,4 +1,4 @@
-# All argo-events services are bound to the "argo-events" service account. 
+# All argo-events services are bound to the "argo-events" service account.
 # In RBAC enabled setups, this SA is bound to specific roles.
 apiVersion: v1
 kind: ServiceAccount
@@ -6,12 +6,13 @@ metadata:
   name: {{ .Values.serviceAccount }}
   namespace: {{ .Release.Namespace }}
 {{- if .Values.additionalSaNamespaces }}
+{{ $sa := .Values.serviceAccount }}
 {{- range $namespace := .Values.additionalSaNamespaces }}
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Values.serviceAccount }}
+  name: {{ $sa }}
   namespace: {{ $namespace }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}