diff --git a/changelog/Changelog-1.7.1.md b/changelog/Changelog-1.7.1.md
index 4921dea15..9b8422c7e 100644
--- a/changelog/Changelog-1.7.1.md
+++ b/changelog/Changelog-1.7.1.md
@@ -3,8 +3,8 @@
 ### 1.7.1
 Images:
 
- * registry.k8s.io/controller:controller-v1.7.1@sha256:7244b95ea47bddcb8267c1e625fb163fc183ef55448855e3ac52a7b260a60407
- * registry.k8s.io/controller-chroot:controller-v1.7.1@sha256:e35d5ab487861b9d419c570e3530589229224a0762c7b4d2e2222434abb8d988
+ * registry.k8s.io/ingress-nginx/controller:v1.7.1@sha256:7244b95ea47bddcb8267c1e625fb163fc183ef55448855e3ac52a7b260a60407
+ * registry.k8s.io/ingress-nginx/controller-chroot:v1.7.1@sha256:e35d5ab487861b9d419c570e3530589229224a0762c7b4d2e2222434abb8d988
  
 ### All Changes:
 
diff --git a/magefiles/helm.go b/magefiles/helm.go
index d56cbed78..585a93413 100644
--- a/magefiles/helm.go
+++ b/magefiles/helm.go
@@ -104,7 +104,7 @@ func updateChartReleaseNotes(releasesNotes []string) {
 	CheckIfError(err, "HELM Could not Load Chart to update release notes %s", HelmChartPath)
 	var releaseNoteString string
 	for i := range releasesNotes {
-		releaseNoteString = fmt.Sprintf("%s - %s\n", releaseNoteString, releasesNotes[i])
+		releaseNoteString = fmt.Sprintf("%s - \"%s\"\n", releaseNoteString, releasesNotes[i])
 	}
 	Info("HELM Release note string %s", releaseNoteString)
 	chart.Annotations["artifacthub.io/changes"] = releaseNoteString
diff --git a/magefiles/release.go b/magefiles/release.go
index aeaafc3d2..c02b88cfd 100644
--- a/magefiles/release.go
+++ b/magefiles/release.go
@@ -356,15 +356,17 @@ func makeReleaseNotes(newVersion string) (*ReleaseNote, error) {
 	c1 := ControllerImage{
 		Digest:   controllerDigest,
 		Registry: INGRESS_REGISTRY,
-		Name:     "controller",
-		Tag:      newReleaseNotes.NewControllerVersion,
+		Name:     "ingress-nginx/controller",
+		Tag:      fmt.Sprintf("v%s", newReleaseNotes.Version),
 	}
+
 	c2 := ControllerImage{
 		Digest:   controllerChrootDigest,
 		Registry: INGRESS_REGISTRY,
-		Name:     "controller-chroot",
-		Tag:      newReleaseNotes.NewControllerVersion,
+		Name:     "ingress-nginx/controller-chroot",
+		Tag:      fmt.Sprintf("v%s", newReleaseNotes.Version),
 	}
+
 	newReleaseNotes.ControllerImages = append(newReleaseNotes.ControllerImages, c1)
 	newReleaseNotes.ControllerImages = append(newReleaseNotes.ControllerImages, c2)
 	Debug("New Release Controller Images %s %s", newReleaseNotes.ControllerImages[0].Digest, newReleaseNotes.ControllerImages[1].Digest)
@@ -413,7 +415,7 @@ func (r ReleaseNote) helmTemplate() {
 	Debug("ChangeLog Templates %s", string(changelogTemplate))
 	t := template.Must(template.New("changelog").Parse(string(changelogTemplate)))
 	// create a new file
-	file, err := os.Create(fmt.Sprintf("charts/ingress-nginx/changelog/Changelog-%s.md", r.Version))
+	file, err := os.Create(fmt.Sprintf("charts/ingress-nginx/changelog/Changelog-%s.md", r.NewHelmChartVersion))
 	if err != nil {
 		ErrorF("Could not create changelog file %s", err)
 	}