diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml
index 9cf45863..162af6c8 100644
--- a/charts/argo-rollouts/Chart.yaml
+++ b/charts/argo-rollouts/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "v1.2.0"
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
-version: 2.16.0
+version: 2.17.0
 icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
@@ -11,4 +11,4 @@ maintainers:
   - name: jessesuen
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Argo rollouts dashboard cluster role readonly flags"
+    - "[Added]: Ability to inject custom environment variables"
diff --git a/charts/argo-rollouts/README.md b/charts/argo-rollouts/README.md
index 87a26250..0b2de8af 100644
--- a/charts/argo-rollouts/README.md
+++ b/charts/argo-rollouts/README.md
@@ -63,6 +63,7 @@ If dashboard is installed by `--set dashboard.enabled=true`, checkout the argo-r
 | controller.component | string | `"rollouts-controller"` | Value of label `app.kubernetes.io/component` |
 | controller.extraArgs | list | `[]` | Additional command line arguments to pass to rollouts-controller.  A list of flags. |
 | controller.extraContainers | list | `[]` | Literal yaml for extra containers to be added to controller deployment. |
+| controller.extraEnv | list | `[]` | Additional environment variables for rollouts-controller. A list of name/value maps. |
 | controller.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | controller.image.registry | string | `"quay.io"` | Registry to use |
 | controller.image.repository | string | `"argoproj/argo-rollouts"` | Repository to use |
@@ -100,6 +101,7 @@ If dashboard is installed by `--set dashboard.enabled=true`, checkout the argo-r
 | dashboard.containerSecurityContext | object | `{}` | Security Context to set on container level |
 | dashboard.enabled | bool | `false` | Deploy dashboard server |
 | dashboard.extraArgs | list | `[]` | Additional command line arguments to pass to rollouts-dashboard. A list of flags. |
+| dashboard.extraEnv | list | `[]` | Additional environment variables for rollouts-dashboard. A list of name/value maps. |
 | dashboard.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | dashboard.image.registry | string | `"quay.io"` | Registry to use |
 | dashboard.image.repository | string | `"argoproj/kubectl-argo-rollouts"` | Repository to use |
@@ -169,4 +171,4 @@ Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/
 [Tolerations]: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
 [priorityClassName]: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
 [Pod Disruption Budget]: https://kubernetes.io/docs/concepts/workloads/pods/disruptions/#pod-disruption-budgets
-[values.yaml]: https://github.com/argoproj/argo-helm/blob/argo-rollouts-2.16.0/charts/argo-rollouts/values.yaml
+[values.yaml]: https://github.com/argoproj/argo-helm/blob/argo-rollouts-2.17.0/charts/argo-rollouts/values.yaml
diff --git a/charts/argo-rollouts/templates/controller/deployment.yaml b/charts/argo-rollouts/templates/controller/deployment.yaml
index ed0d4ebf..223d13f0 100644
--- a/charts/argo-rollouts/templates/controller/deployment.yaml
+++ b/charts/argo-rollouts/templates/controller/deployment.yaml
@@ -43,6 +43,10 @@ spec:
         {{- with .Values.controller.extraArgs }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+        {{- with .Values.controller.extraEnv }}
+        env:
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
         imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
         name: argo-rollouts
         ports:
diff --git a/charts/argo-rollouts/templates/dashboard/deployment.yaml b/charts/argo-rollouts/templates/dashboard/deployment.yaml
index 33310ef5..a84d4bbf 100644
--- a/charts/argo-rollouts/templates/dashboard/deployment.yaml
+++ b/charts/argo-rollouts/templates/dashboard/deployment.yaml
@@ -39,6 +39,10 @@ spec:
         {{- with .Values.dashboard.extraArgs }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+        {{- with .Values.dashboard.extraEnv }}
+        env:
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
         name: argo-rollouts-dashboard
         ports:
         - containerPort: {{ .Values.dashboard.service.targetPort }}
diff --git a/charts/argo-rollouts/values.yaml b/charts/argo-rollouts/values.yaml
index 99d43d4e..aa98cbb8 100644
--- a/charts/argo-rollouts/values.yaml
+++ b/charts/argo-rollouts/values.yaml
@@ -48,6 +48,11 @@ controller:
   # -- Additional command line arguments to pass to rollouts-controller.  A list of flags.
   extraArgs: []
 
+  # -- Additional environment variables for rollouts-controller. A list of name/value maps.
+  extraEnv: []
+    # - name: AWS_REGION
+    #   value: us-east-1
+
   # -- Literal yaml for extra containers to be added to controller deployment.
   ## Additional containers to add to the rollouts controller deployment
   ## This will be rendered as the literal yaml
@@ -176,6 +181,10 @@ dashboard:
     pullPolicy: IfNotPresent
   # -- Additional command line arguments to pass to rollouts-dashboard. A list of flags.
   extraArgs: []
+  # -- Additional environment variables for rollouts-dashboard. A list of name/value maps.
+  extraEnv: []
+    # - name: FOO
+    #   value: bar
   # -- Resource limits and requests for the dashboard pods.
   resources: {}
   # -- Security Context to set on pod level