diff --git a/stable/gocd/CHANGELOG.md b/stable/gocd/CHANGELOG.md
index 7c040037c3..d788f29263 100644
--- a/stable/gocd/CHANGELOG.md
+++ b/stable/gocd/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.22.1
+* [b856007](https://github.com/kubernetes/charts/commit/b856007): Ingress version api change
+* [e2f27a9](https://github.com/kubernetes/charts/commit/e2f27a9): Quote ingress host
+
 ### 1.22.0
 * [bcd9825](https://github.com/kubernetes/charts/commit/bcd9825): Bump up GoCD Version to 20.1.0
 ### 1.21.0
diff --git a/stable/gocd/Chart.yaml b/stable/gocd/Chart.yaml
index 11bc592491..aca5175641 100644
--- a/stable/gocd/Chart.yaml
+++ b/stable/gocd/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: gocd
 home: https://www.gocd.org/
-version: 1.22.0
+version: 1.22.1
 appVersion: 20.1.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/templates/ingress.yaml b/stable/gocd/templates/ingress.yaml
index aef48da5da..7a7cef3b53 100644
--- a/stable/gocd/templates/ingress.yaml
+++ b/stable/gocd/templates/ingress.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.server.enabled }}
 {{- if .Values.server.ingress.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: {{ template "gocd.fullname" . }}-server
@@ -19,7 +19,7 @@ spec:
   {{ $dot := .}}
   rules:
     {{- range $host := .Values.server.ingress.hosts }}
-    - host: {{ $host }}
+    - host: {{ $host | quote }}
       http:
         paths:
         - backend: