diff --git a/stable/gocd/CHANGELOG.md b/stable/gocd/CHANGELOG.md
index 559e3d9990..41a84e5213 100644
--- a/stable/gocd/CHANGELOG.md
+++ b/stable/gocd/CHANGELOG.md
@@ -1,3 +1,10 @@
+### 1.6.2
+
+* [fe985d7](https://github.com/kubernetes/charts/commit/fe985d7):
+  - Deprecate agent.env.agentAutoRegisterEnvironemnts in favour of agent.env.agentAutoRegisterEnvironments.
+
+  *Please note that the deprecated property will be removed in GoCD 19.3.0 (that is, when Chart.appVersion is 19.3.0). Users are encouraged to use the new property `agent.env.agentAutoRegisterEnvironments`.*
+
 ### 1.6.1
 
 * [28d5416](https://github.com/kubernetes/charts/commit/28d5416):
diff --git a/stable/gocd/Chart.yaml b/stable/gocd/Chart.yaml
index f6dff31e4b..128d4166b1 100644
--- a/stable/gocd/Chart.yaml
+++ b/stable/gocd/Chart.yaml
@@ -1,6 +1,6 @@
 name: gocd
 home: https://www.gocd.org/
-version: 1.6.1
+version: 1.6.2
 appVersion: 18.12.0
 description: GoCD is an open-source continuous delivery server to model and visualize complex workflows with ease.
 icon: https://gocd.github.io/assets/images/go-icon-black-192x192.png
diff --git a/stable/gocd/README.md b/stable/gocd/README.md
index a50a1679df..9dbcd00222 100644
--- a/stable/gocd/README.md
+++ b/stable/gocd/README.md
@@ -171,7 +171,7 @@ $ kubectl create secret generic gocd-server-ssh \
 | `agent.env.goServerUrl`                   | GoCD Server Url. If nil, discovers the GoCD server service if its available on the Kubernetes cluster                                                                            | `nil`                        |
 | `agent.env.agentAutoRegisterKey`          | GoCD Agent autoregister key                                                                                                                                                      | `nil`                        |
 | `agent.env.agentAutoRegisterResources`    | Comma separated list of GoCD Agent resources                                                                                                                                     | `nil`                        |
-| `agent.env.agentAutoRegisterEnvironemnts` | Comma separated list of GoCD Agent environments                                                                                                                                  | `nil`                        |
+| `agent.env.agentAutoRegisterEnvironments` | Comma separated list of GoCD Agent environments                                                                                                                                  | `nil`                        |
 | `agent.env.agentAutoRegisterHostname`     | GoCD Agent hostname                                                                                                                                                              | `nil`                        |
 | `agent.env.goAgentBootstrapperArgs`       | GoCD Agent Bootstrapper Args. It can be used to [Configure end-to-end transport security](https://docs.gocd.org/current/installation/ssl_tls/end_to_end_transport_security.html) | `nil`                        |
 | `agent.env.goAgentBootstrapperJvmArgs`    | GoCD Agent Bootstrapper JVM Args.                                                                                                                                                | `nil`                        |
diff --git a/stable/gocd/templates/NOTES.txt b/stable/gocd/templates/NOTES.txt
index 251ec249fd..3c7b7fbdcd 100644
--- a/stable/gocd/templates/NOTES.txt
+++ b/stable/gocd/templates/NOTES.txt
@@ -61,3 +61,9 @@
     WARNING: Persistence is disabled. You will lose all data at the time of pod termination!
     ################################################################################################
 {{ end }}
+
+{{- if .Values.agent.env.agentAutoRegisterEnvironemnts -}}
+6. Deprecations
+   The property `agent.env.agentAutoRegisterEnvironemnts` is deprecated in favor of `agent.env.agentAutoRegisterEnvironments`.
+   Please note that the deprecated property will be removed in GoCD 19.3.0 (that is, when Chart.appVersion is 19.3.0). Users are encouraged to use the new property `agent.env.agentAutoRegisterEnvironments`.
+{{ end }}
\ No newline at end of file
diff --git a/stable/gocd/templates/gocd-agent-deployment.yaml b/stable/gocd/templates/gocd-agent-deployment.yaml
index d7738a690e..59b4c93422 100644
--- a/stable/gocd/templates/gocd-agent-deployment.yaml
+++ b/stable/gocd/templates/gocd-agent-deployment.yaml
@@ -73,7 +73,10 @@ spec:
             - name: AGENT_AUTO_REGISTER_RESOURCES
               value: {{ .Values.agent.env.agentAutoRegisterResources }}
             {{- end }}
-            {{- if .Values.agent.env.agentAutoRegisterEnvironemnts }}
+            {{- if .Values.agent.env.agentAutoRegisterEnvironments }}
+            - name: AGENT_AUTO_REGISTER_ENVIRONMENTS
+              value: {{ .Values.agent.env.agentAutoRegisterEnvironments }}
+            {{- else if .Values.agent.env.agentAutoRegisterEnvironemnts }}
             - name: AGENT_AUTO_REGISTER_ENVIRONMENTS
               value: {{ .Values.agent.env.agentAutoRegisterEnvironemnts }}
             {{- end }}
diff --git a/stable/gocd/values.yaml b/stable/gocd/values.yaml
index 29b971dfcb..41ce274b6b 100644
--- a/stable/gocd/values.yaml
+++ b/stable/gocd/values.yaml
@@ -217,7 +217,10 @@ agent:
     # agent.env.agentAutoRegisterResources is the GoCD Agent auto-register resources
     agentAutoRegisterResources:
     # agent.env.agentAutoRegisterEnvironments is the GoCD Agent auto-register Environments
+    # deprecated because of a typo. Use agent.env.agentAutoRegisterEnvironments instead
     agentAutoRegisterEnvironemnts:
+    # agent.env.agentAutoRegisterEnvironments is the GoCD Agent auto-register Environments
+    agentAutoRegisterEnvironments:
     # agent.env.agentAutoRegisterHostname is the GoCD Agent auto-register hostname
     agentAutoRegisterHostname:
     # agent.env.goAgentSystemProperties is the GoCD Agent system properties