diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index 022e953d..28e783dc 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v2.8.0
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.9.6
+version: 0.9.7
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml
index 5f5ff726..52acbc79 100644
--- a/charts/argo/templates/server-deployment.yaml
+++ b/charts/argo/templates/server-deployment.yaml
@@ -63,6 +63,14 @@ spec:
             value: {{ .Values.server.baseHref | quote }}
           resources:
             {{- toYaml .Values.server.resources | nindent 12 }}
+          {{- with .Values.server.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 12}}
+          {{- end }}
+      {{- with .Values.server.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8}}
+      {{- end }}
       {{- with .Values.server.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml
index 38bcba23..b6d56e64 100644
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@@ -67,3 +67,6 @@ data:
     {{- if .Values.controller.workflowDefaults }}
     workflowDefaults:
 {{ toYaml .Values.controller.workflowDefaults | indent 6 }}{{- end }}
+    {{- with .Values.controller.sso }}
+    sso:
+{{ toYaml . | indent 6 }}{{- end }}
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index a5492cb6..2525b7bd 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -54,6 +54,7 @@ controller:
   #     name: argo-postgres-config
   #     key: password
   workflowDefaults: {}  # Only valid for 2.7+
+  sso: {}  # Only valid for 2.9+
   #  spec:
   #    ttlStrategy:
   #      secondsAfterCompletion: 84600
@@ -164,6 +165,10 @@ server:
   # Extra arguments to provide to the Argo server binary.
   extraArgs: []
 
+  ## Additional volumes to the server main container.
+  volumeMounts: []
+  volumes: []
+
   ## Ingress configuration.
   ## ref: https://kubernetes.io/docs/user-guide/ingress/
   ##