diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index e7e48429..c2013af2 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.2.4"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 1.0.7
+version: 1.0.8
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 keywords:
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index caee1092..28f5f678 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -51,7 +51,7 @@ $ helm install --name my-release argo/argo-cd
 | controller.args.statusProcessors | define the controller `--status-processors` | `"20"` |
 | controller.clusterAdminAccess.enabled | Enable RBAC for local cluster deployments. | `true` |
 | controller.containerPort | Controller listening port. | `8082` |
-| controller.extraArgs | Additional arguments for the controller. | `[]` |
+| controller.extraArgs | Additional arguments for the controller. A list of key:value pairs | `[]` |
 | controller.image.repository | Repository to use for the controller | `global.image.repository` |
 | controller.image.imagePullPolicy | Image pull policy for the controller | `global.image.imagePullPolicy` |
 | controller.image.tag | Tag to use for the controller | `global.image.tag` |
@@ -93,7 +93,7 @@ $ helm install --name my-release argo/argo-cd
 |-----|------|---------|-------------|
 | repoServer.affinity | Assign custom affinity rules to the deployment https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ | `{}` |
 | repoServer.containerPort | Repo server port | `8081` |
-| repoServer.extraArgs | Additional arguments for the repo server | `[]` |
+| repoServer.extraArgs | Additional arguments for the repo server. A  list of key:value pairs. | `[]` |
 | repoServer.image.repository | Repository to use for the repo server | `global.image.repository` |
 | repoServer.image.imagePullPolicy | Image pull policy for the repo server | `global.image.imagePullPolicy` |
 | repoServer.image.tag | Tag to use for the repo server | `global.image.tag` |
@@ -138,7 +138,7 @@ $ helm install --name my-release argo/argo-cd
 | server.certificate.issuer | Certificate manager issuer | `{}` |
 | server.config | URL for Argo CD | `{}` |
 | server.containerPort | Server container port. | `8080` |
-| server.extraArgs | Additional arguments for the server | `[]` |
+| server.extraArgs | Additional arguments for the server. A list of key:value pairs. | `[]` |
 | server.image.repository | Repository to use for the server | `global.image.repository` |
 | server.image.imagePullPolicy | Image pull policy for the server | `global.image.imagePullPolicy` |
 | server.image.tag | Tag to use for the repo server | `global.image.tag` |
@@ -216,7 +216,7 @@ $ helm install --name my-release argo/argo-cd
 |-----|------|---------|-------------|
 | redis.affinity | Assign custom affinity rules to the deployment https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ | `{}` |
 | redis.containerPort | Redis container port | `6379` |
-| redis.enabled | Enable redis | `false` |
+| redis.enabled | Enable redis | `true` |
 | redis.image.imagePullPolicy | Redis imagePullPolicy | `"IfNotPresent"` |
 | redis.image.repository | Redis repository | `"redis"` |
 | redis.image.tag | Redis tag | `"5.0.3"` |
diff --git a/charts/argo-cd/templates/argocd-server/ingress.yaml b/charts/argo-cd/templates/argocd-server/ingress.yaml
index 68ffbe5d..c3a84ea4 100644
--- a/charts/argo-cd/templates/argocd-server/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.server.ingress.enabled -}}
 {{- $serviceName := include "argo-cd.server.fullname" . -}}
-{{- $servicePort := .Values.server.name -}}
+{{- $servicePort := .Values.server.service.servicePortHttp -}}
 {{- $paths := .Values.server.ingress.paths -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 5fbf7fe3..53a66acb 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -27,6 +27,7 @@ controller:
   logLevel: info
 
   ## Additional command line arguments to pass to argocd-controller
+  ## - key: value
   extraArgs: []
 
   ## Annotations to be added to controller pods
@@ -158,7 +159,7 @@ dex:
 
 ## Redis
 redis:
-  enabled: false
+  enabled: true
   name: redis
 
   image:
@@ -196,8 +197,9 @@ server:
   #  imagePullPolicy: IfNotPresent
 
   ## Additional command line arguments to pass to argocd-server
+  ## - key: value
   # extraArgs: []
-  #   - insecure
+  #   - insecure: true
   extraArgs: []
 
   ## Argo server log level
@@ -402,7 +404,7 @@ repoServer:
   #  imagePullPolicy: IfNotPresent
 
   ## Additional command line arguments to pass to argocd-repo-server
-  ##
+  ## - key: value
   extraArgs: []
 
   ## Argo repoServer log level