diff --git a/changelog/controller.md.gotmpl b/changelog/controller.md.gotmpl
index d35df8ade..e1ae13cc5 100644
--- a/changelog/controller.md.gotmpl
+++ b/changelog/controller.md.gotmpl
@@ -1,15 +1,22 @@
 # Changelog
 
-### {{  .Version }}
-Images:
+### {{ .NewControllerVersion }}
 {{ with .ControllerImages }}
-{{ range . }} * {{ .Registry }}/{{ .Name }}:{{ .Tag}}@{{ .Digest }}
-{{ end }} {{ end }}
-### All Changes:
-{{ with .Updates }}
-{{ range . }}* {{ . }}
-{{ end }}{{ end }}
-### Dependencies updates: {{ with .DepUpdates }}
-{{ range . }}* {{ . }}
-{{ end }} {{ end }}
+Images:
+{{ range . }}
+* {{ .Registry }}/{{ .Name }}:{{ .Tag}}@{{ .Digest }}
+{{- end }}
+{{ end }}
+{{- with .Updates }}
+### All changes:
+{{ range . }}
+* {{ . }}
+{{- end }}
+{{ end }}
+{{- with .DepUpdates }}
+### Dependency updates:
+{{ range . }}
+* {{ . }}
+{{- end }}
+{{ end }}
 **Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-{{ .PreviousControllerVersion }}...controller-{{ .NewControllerVersion }}