diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml
index b7b92734..14d8b988 100644
--- a/charts/argo/templates/server-deployment.yaml
+++ b/charts/argo/templates/server-deployment.yaml
@@ -32,9 +32,12 @@ spec:
           image: "{{ .Values.images.namespace }}/{{ .Values.images.server }}:{{ default .Values.images.tag .Values.server.image.tag }}"
           imagePullPolicy: {{ .Values.images.pullPolicy }}
           args:
-          - "server"
-          - "--configmap"
-          - "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap"
+            - "server"
+            - "--configmap"
+            - "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap"
+            {{- range $name, $value := .Values.server.args }}
+            - --{{ $name }}={{ $value }}
+            {{- end }}
           resources:
             {{- toYaml .Values.server.resources | nindent 12 }}
           {{- if .Values.server.metricsConfig.enabled }}
diff --git a/charts/argo/templates/server-ingress.yaml b/charts/argo/templates/server-ingress.yaml
new file mode 100644
index 00000000..5786e257
--- /dev/null
+++ b/charts/argo/templates/server-ingress.yaml
@@ -0,0 +1,32 @@
+{{- if .Values.server.enabled -}}
+{{- if .Values.server.ingress.enabled -}}
+{{- $serviceName := printf "%s-%s" .Release.Name .Values.server.name -}}
+{{- $servicePort := .Values.server.servicePort -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ .Release.Name }}-{{ .Values.server.name }}
+  labels:
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    {{- range $key, $value := .Values.server.ingress.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+spec:
+  rules:
+    {{- range .Values.server.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - backend:
+              serviceName: {{ $serviceName }}
+              servicePort: {{ $servicePort }}
+    {{- end -}}
+  {{- if .Values.server.ingress.tls }}
+  tls:
+{{ toYaml .Values.server.ingress.tls | indent 4 }}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 5be00374..eeabe104 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -107,11 +107,19 @@ server:
   name: server
   image:
     tag: ""
+  args: {}
+  # Use this to pass additional server args.
+  # Examples:
+  # auth-mode: hybrid
+  # basehref: ui
+
   # podAnnotations is an optional map of annotations to be applied to the server Pods
   podAnnotations: {}
+
   # Optional labels to add to the server pods
   podLabels: {}
   # podPortName: http
+
   metricsConfig:
     enabled: false
     path: /metrics
@@ -139,6 +147,28 @@ server:
   logging:
     level: info
     globallevel: "0"
+  ingress:
+    enabled: false
+
+    ## Annotations to be added to the web ingress.
+    ##
+    # annotations:
+    #   kubernetes.io/ingress.class: nginx
+    #   kubernetes.io/tls-acme: "true"
+
+    ## Hostnames.
+    ## Must be provided if Ingress is enabled.
+    ##
+    # hosts:
+    #   - argo.domain.com
+
+    ## TLS configuration.
+    ## Secrets must be manually created in the namespace.
+    ##
+    # tls:
+    #   - secretName: argo-ui-tls
+    #     hosts:
+    #       - argo.domain.com
 
 ui:
   enabled: true