diff --git a/config/charts/knative-operator/templates/operator.yaml b/config/charts/knative-operator/templates/operator.yaml
index 101ccda9a..61ae756c5 100644
--- a/config/charts/knative-operator/templates/operator.yaml
+++ b/config/charts/knative-operator/templates/operator.yaml
@@ -48,10 +48,10 @@ metadata:
     app.kubernetes.io/component: operator-webhook
     app.kubernetes.io/version: "{{ .Chart.Version }}"
     app.kubernetes.io/name: knative-operator
-  {{- if and .Values.knative_operator.operator_webhook.annotations }}
+{{- if and .Values.knative_operator.operator_webhook.annotations }}
   annotations:
-    {{ toYaml .Values.knative_operator.operator_webhook.annotations }}
-  {{- end }}
+{{ toYaml .Values.knative_operator.operator_webhook.annotations | indent 4 }}
+{{- end }}
 spec:
   selector:
     matchLabels:
@@ -66,19 +66,19 @@ spec:
         app.kubernetes.io/version: "{{ .Chart.Version }}"
         app.kubernetes.io/name: knative-operator
         sidecar.istio.io/inject: "false"
-      {{- if and .Values.knative_operator.operator_webhook.podAnnotations }}
+{{- if and .Values.knative_operator.operator_webhook.podAnnotations }}
       annotations:
-        {{ toYaml .Values.knative_operator.operator_webhook.podAnnotations }}
-      {{- end }}
+{{ toYaml .Values.knative_operator.operator_webhook.podAnnotations | indent 8 }}
+{{- end }}
     spec:
-      {{- if .Values.knative_operator.operator_webhook.affinity }}
+{{- if .Values.knative_operator.operator_webhook.affinity }}
       affinity:
-      {{ toYaml .Values.knative_operator.operator_webhook.affinity | indent 8 }}
-      {{- end }}
-      {{- if and .Values.knative_operator.operator_webhook.securityContext }}
+{{ toYaml .Values.knative_operator.operator_webhook.affinity | indent 8 }}
+{{- end }}
+{{- if and .Values.knative_operator.operator_webhook.securityContext }}
       securityContext:
-        {{ toYaml .Values.knative_operator.operator_webhook.securityContext }}
-      {{- end }}
+{{ toYaml .Values.knative_operator.operator_webhook.securityContext | indent 8 }}
+{{- end }}
       serviceAccountName: operator-webhook
       containers:
       - name: operator-webhook
@@ -6330,10 +6330,10 @@ metadata:
   labels:
     app.kubernetes.io/name: knative-operator
     app.kubernetes.io/version: "{{ .Chart.Version }}"
-  {{- if and .Values.knative_operator.knative_operator.annotations }}
+{{- if and .Values.knative_operator.knative_operator.annotations }}
   annotations:
-    {{ toYaml .Values.knative_operator.knative_operator.annotations }}
-  {{- end }}
+{{ toYaml .Values.knative_operator.knative_operator.annotations | indent 4 }}
+{{- end }}
 spec:
   replicas: 1
   selector:
@@ -6346,20 +6346,20 @@ spec:
         app.kubernetes.io/name: knative-operator
         app.kubernetes.io/version: "{{ .Chart.Version }}"
         sidecar.istio.io/inject: "false"
-      {{- if and .Values.knative_operator.knative_operator.podAnnotations }}
+{{- if and .Values.knative_operator.knative_operator.podAnnotations }}
       annotations:
-        {{ toYaml .Values.knative_operator.knative_operator.podAnnotations }}
-      {{- end }}
+{{ toYaml .Values.knative_operator.knative_operator.podAnnotations | indent 8 }}
+{{- end }}
     spec:
-      {{- if .Values.knative_operator.knative_operator.affinity }}
+{{- if .Values.knative_operator.knative_operator.affinity }}
       affinity:
-      {{ toYaml .Values.knative_operator.knative_operator.affinity | indent 8 }}
-      {{- end }}
+{{ toYaml .Values.knative_operator.knative_operator.affinity | indent 8 }}
+{{- end }}
       serviceAccountName: knative-operator
-      {{- if and .Values.knative_operator.knative_operator.securityContext }}
+{{- if and .Values.knative_operator.knative_operator.securityContext }}
       securityContext:
-        {{ toYaml .Values.knative_operator.knative_operator.securityContext }}
-      {{- end }}
+{{ toYaml .Values.knative_operator.knative_operator.securityContext | indent 8 }}
+{{- end }}
       containers:
         - name: knative-operator
           image: "{{ .Values.knative_operator.knative_operator.image }}:{{ .Values.knative_operator.knative_operator.tag }}"
diff --git a/hack/generate-helm.sh b/hack/generate-helm.sh
index 62e0d5277..744adac2c 100755
--- a/hack/generate-helm.sh
+++ b/hack/generate-helm.sh
@@ -19,7 +19,7 @@ set -o nounset
 set -o pipefail
 
 # Set the version and tag in Chart.yaml and values.yaml
-VERSION=v1.16.0
+VERSION=v1.17.0
 if [[ -n "${TAG:-}" ]]; then
   VERSION=${TAG}
 fi