diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml
index 8abe0faf..5f5ff726 100644
--- a/charts/argo/templates/server-deployment.yaml
+++ b/charts/argo/templates/server-deployment.yaml
@@ -55,7 +55,10 @@ spec:
           - name: IN_CLUSTER
             value: "true"
           - name: ARGO_NAMESPACE
-            value: {{ .Release.Namespace | quote }}
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: metadata.namespace
           - name: BASE_HREF
             value: {{ .Values.server.baseHref | quote }}
           resources:
diff --git a/charts/argo/templates/server-sa.yaml b/charts/argo/templates/server-sa.yaml
index 2d99df48..c0d332e1 100644
--- a/charts/argo/templates/server-sa.yaml
+++ b/charts/argo/templates/server-sa.yaml
@@ -4,5 +4,5 @@ kind: ServiceAccount
 metadata:
   name: {{ .Values.server.serviceAccount }}
   annotations:
-{{ toYaml .Values.server.serviceAccountAnnotation | indent 4 }}
+{{ toYaml .Values.server.serviceAccountAnnotations | indent 4 }}
 {{- end -}}
diff --git a/charts/argo/templates/workflow-controller-sa.yaml b/charts/argo/templates/workflow-controller-sa.yaml
index e9134be8..02d274da 100644
--- a/charts/argo/templates/workflow-controller-sa.yaml
+++ b/charts/argo/templates/workflow-controller-sa.yaml
@@ -3,4 +3,4 @@ kind: ServiceAccount
 metadata:
   name: {{ .Values.controller.serviceAccount }}
   annotations:
-{{ toYaml .Values.controller.serviceAccountAnnotation | indent 4 }}
+{{ toYaml .Values.controller.serviceAccountAnnotations | indent 4 }}
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 6f4ce999..b1324014 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -64,7 +64,7 @@ controller:
     additionalLabels: {}
   serviceAccount: argo
   # Service account annotations
-  serviceAccountAnnotation: {}
+  serviceAccountAnnotations: {}
   name: workflow-controller
   workflowNamespaces:
     - default
@@ -131,7 +131,7 @@ server:
   # servicePortName: http
   serviceAccount: argo-server
   # Service account annotations
-  serviceAccountAnnotation: {}
+  serviceAccountAnnotations: {}
   # Annotations to be applied to the UI Service
   serviceAnnotations: {}
   # Optional labels to add to the UI Service