diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index 33604dcb..39f01262 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "v2.6.1"
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.7.3
+version: 0.8.0
 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 bbf82dd1..ceea3795 100644
--- a/charts/argo/templates/server-deployment.yaml
+++ b/charts/argo/templates/server-deployment.yaml
@@ -30,6 +30,7 @@ spec:
       containers:
         - name: argo-server
           args:
+          - --configmap={{ .Release.Name }}-{{ .Values.controller.name }}-configmap
           - server
           {{- if .Values.server.extraArgs }}
           {{- toYaml .Values.server.extraArgs | nindent 10 }}
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index e1bb1376..21bc1636 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -4,7 +4,7 @@ images:
   server: argocli
   executor: argoexec
   pullPolicy: Always
-  tag: v2.6.1
+  tag: v2.7.0
 
 crdVersion: v1alpha1
 installCRD: true