diff --git a/Changelog.md b/Changelog.md
index 15f160ebe..57ffbbf7e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,18 @@
 # Changelog
 
+### 0.17.1
+
+**Image:**  `quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.17.1`
+
+*Changes:*
+
+- [X] [#2782](https://github.com/kubernetes/ingress-nginx/pull/2782) Add Better Error Handling for SSLSessionTicketKey
+- [X] [#2790](https://github.com/kubernetes/ingress-nginx/pull/2790) Update prometheus labels
+
+*Documentation:*
+
+- [X] [#2770](https://github.com/kubernetes/ingress-nginx/pull/2770) Basic-Auth doc misleading: fix double quotes leading to nginx config error
+
 ### 0.17.0
 
 **Image:**  `quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.17.0`
diff --git a/Makefile b/Makefile
index 6265517aa..426970cb9 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 all: all-container
 
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
-TAG ?= 0.17.0
+TAG ?= 0.17.1
 REGISTRY ?= quay.io/kubernetes-ingress-controller
 DOCKER ?= docker
 SED_I ?= sed -i
diff --git a/deploy/mandatory.yaml b/deploy/mandatory.yaml
index e61827fa0..cf1d7ed5c 100644
--- a/deploy/mandatory.yaml
+++ b/deploy/mandatory.yaml
@@ -242,7 +242,7 @@ spec:
       serviceAccountName: nginx-ingress-serviceaccount
       containers:
         - name: nginx-ingress-controller
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.17.0
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.17.1
           args:
             - /nginx-ingress-controller
             - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
diff --git a/deploy/with-rbac.yaml b/deploy/with-rbac.yaml
index 4d486ca17..313c96081 100644
--- a/deploy/with-rbac.yaml
+++ b/deploy/with-rbac.yaml
@@ -21,7 +21,7 @@ spec:
       serviceAccountName: nginx-ingress-serviceaccount
       containers:
         - name: nginx-ingress-controller
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.17.0
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.17.1
           args:
             - /nginx-ingress-controller
             - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
diff --git a/docs/deploy/upgrade.md b/docs/deploy/upgrade.md
index 4db87af23..f57cc468c 100644
--- a/docs/deploy/upgrade.md
+++ b/docs/deploy/upgrade.md
@@ -33,7 +33,7 @@ The easiest way to do this is e.g. (do note you may need to change the name para
 
 ```
 kubectl set image deployment/nginx-ingress-controller \
-  nginx-ingress-controller=nginx:quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.17.0
+  nginx-ingress-controller=nginx:quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.17.1
 ```
 
 For interactive editing, use `kubectl edit deployment nginx-ingress-controller`.
diff --git a/docs/examples/static-ip/nginx-ingress-controller.yaml b/docs/examples/static-ip/nginx-ingress-controller.yaml
index bc9215e1a..aa2cdf107 100644
--- a/docs/examples/static-ip/nginx-ingress-controller.yaml
+++ b/docs/examples/static-ip/nginx-ingress-controller.yaml
@@ -21,7 +21,7 @@ spec:
       # hostNetwork: true
       terminationGracePeriodSeconds: 60
       containers:
-      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.17.0
+      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.17.1
         name: nginx-ingress-controller
         readinessProbe:
           httpGet: