diff --git a/stable/gangway/Chart.yaml b/stable/gangway/Chart.yaml
index 2bd9b907ec..6ac2f3cdb1 100644
--- a/stable/gangway/Chart.yaml
+++ b/stable/gangway/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: An application that can be used to easily enable authentication flows via OIDC for a kubernetes cluster.
 name: gangway
-version: 0.1.5
+version: 0.1.6
 appVersion: 3.0.0
 home: https://github.com/heptiolabs/gangway
 sources:
diff --git a/stable/gangway/README.md b/stable/gangway/README.md
index 5a51147e37..2c0f633601 100644
--- a/stable/gangway/README.md
+++ b/stable/gangway/README.md
@@ -55,6 +55,7 @@ At a minimum you *must* configure any of the values marked as **required** in th
 | `gangway.tokenURL`                | OAuth2 URL to obtain access tokens. To be taken from the configuration of your OIDC provider. **Required**                                                                                                      | `""`                                               |
 | `gangway.trustedCAPath`           | The path to a root CA to trust for self signed certificates at the Oauth2 URLs                                                                                                                                  | `""`                                               |
 | `gangway.usernameClaim`           | The JWT claim to use as the username. This is used in UI. Default is "nickname". This is combined with the clusterName for the "user" portion of the kubeconfig.                                                | `name`                                             |
+| `trustedCACert`                   | Specify a CA cert to trust for self signed certificates at the Oauth2 URLs.                                                                                                                                     | `""`                                               |
 | `image.repository`                | Container image name (Including repository name if not `hub.docker.com`).                                                                                                                                       | `gcr.io/heptio-images/gangway`                     |
 | `image.pullPolicy`                | Container pull policy.                                                                                                                                                                                          | `IfNotPresent`                                     |
 | `image.tag`                       | Container image tag.                                                                                                                                                                                            | `v2.2.0`                                           |
diff --git a/stable/gangway/templates/configmap.yaml b/stable/gangway/templates/configmap.yaml
index 0b771a6e0b..43cd45c11b 100644
--- a/stable/gangway/templates/configmap.yaml
+++ b/stable/gangway/templates/configmap.yaml
@@ -10,5 +10,11 @@ metadata:
 data:
   gangway.yaml: |
     {{- .Values.gangway | toYaml | nindent 4 }}
+    {{- if .Values.trustedCACert }}
+    trustedCAPath: /gangway/rootca.crt
+  rootca.crt: |
+    {{- .Values.trustedCACert | nindent 4}}
+    {{ end }}
+
 
 
diff --git a/stable/gangway/values.yaml b/stable/gangway/values.yaml
index 6744d08d6d..f8c81c17fd 100644
--- a/stable/gangway/values.yaml
+++ b/stable/gangway/values.yaml
@@ -12,6 +12,13 @@ image:
 nameOverride: ""
 fullnameOverride: ""
 
+# Specify a CA cert to trust for self signed certificates at the Oauth2 URLs.  Be careful to indent one level beyond the
+# trustedCACert key:
+# trustedCACert: |-
+#  -----BEGIN CERTIFICATE-----
+#  ...
+#  -----END CERTIFICATE-----
+
 gangway:
   # The address to listen on. Defaults to 0.0.0.0 to listen on all interfaces.
   # Env var: GANGWAY_HOST
@@ -89,9 +96,6 @@ gangway:
   # Env var: GANGWAY_CLUSTER_CA_PATH
   # cluster_ca_path: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
 
-  # The path to a root CA to trust for self signed certificates at the Oauth2 URLs
-  # Env var: GANGWAY_TRUSTED_CA_PATH
-  # trustedCAPath: /cacerts/rootca.crt
 
   # The path gangway uses to create urls (defaults to "")
   # Env var: GANGWAY_HTTP_PATH