diff --git a/.github/workflows/lint-test-chart.yaml b/.github/workflows/lint-test-chart.yaml
index 064d2de31..b8425afa7 100644
--- a/.github/workflows/lint-test-chart.yaml
+++ b/.github/workflows/lint-test-chart.yaml
@@ -15,10 +15,19 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Run Artifact Hub lint
+        shell: bash
+        run: |
+          set -euo pipefail
+          curl -Lo ah_linux_amd64.tar.gz https://github.com/artifacthub/hub/releases/download/v1.6.0/ah_1.6.0_linux_amd64.tar.gz
+          tar -xzvf ah_linux_amd64.tar.gz ah
+          ./ah lint --kind helm || exit 1
+          rm -f ./ah ./ah_linux_amd64.tar.gz
+
       - name: Set up Helm
         uses: azure/setup-helm@v1
         with:
-          version: v3.6.3
+          version: 3.*
 
       - name: Set up Python
         uses: actions/setup-python@v2
@@ -26,7 +35,7 @@ jobs:
           python-version: 3.7
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.1.0
+        uses: helm/chart-testing-action@v2.2.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed
diff --git a/.github/workflows/release-chart.yaml b/.github/workflows/release-chart.yaml
index 34bd1e779..5ec348654 100644
--- a/.github/workflows/release-chart.yaml
+++ b/.github/workflows/release-chart.yaml
@@ -17,6 +17,27 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Get chart version
+        id: chart_version
+        shell: bash
+        run: |
+          set -euo pipefail
+          chart_version="$(grep -Po "(?<=^version: ).+" charts/external-dns/Chart.yaml)"
+          echo "::set-output name=version::${chart_version}"
+
+      - name: Get changelog entry
+        id: changelog_reader
+        uses: mindsers/changelog-reader-action@v2
+        with:
+          path: charts/external-dns/CHANGELOG.md
+          version: "v${{ steps.chart_version.outputs.version }}"
+
+      - name: Create release notes
+        shell: bash
+        run: |
+          set -euo pipefail
+          printf '${{ steps.changelog_reader.outputs.changes }}' > charts/external-dns/_release-notes.md
+
       - name: Configure Git
         run: |
           git config user.name "$GITHUB_ACTOR"
@@ -28,7 +49,8 @@ jobs:
           version: v3.6.3
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.2.1
+        uses: helm/chart-releaser-action@v1.3.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           CR_RELEASE_NAME_TEMPLATE: "external-dns-helm-chart-{{ .Version }}"
+          CR_RELEASE_NOTES_FILE: _release-notes.md
diff --git a/charts/external-dns/CHANGELOG.md b/charts/external-dns/CHANGELOG.md
new file mode 100644
index 000000000..39f0df3c9
--- /dev/null
+++ b/charts/external-dns/CHANGELOG.md
@@ -0,0 +1,24 @@
+# ExternalDNS Helm Chart Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+---
+
+<!-- ## [UNRELEASED]
+### Added
+### Changed
+### Deprecated
+### Removed -->
+
+## [v1.8.0] - UNRELEASED
+
+### Added
+
+- Add annotations to Deployment. [#2477](https://github.com/kubernetes-sigs/external-dns/pull/2477) from @beastob
+
+### Changed
+
+- Fix RBAC for `istio-virtualservice` source when `istio-gateway` isn't also added. [#2564](https://github.com/kubernetes-sigs/external-dns/pull/2564) from @mcwarman
diff --git a/charts/external-dns/Chart.yaml b/charts/external-dns/Chart.yaml
index 612755951..7d61a3c69 100644
--- a/charts/external-dns/Chart.yaml
+++ b/charts/external-dns/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: external-dns
 description: ExternalDNS synchronizes exposed Kubernetes Services and Ingresses with DNS providers.
 type: application
-version: 1.7.1
+version: 1.8.0
 appVersion: 0.10.2
 keywords:
   - kubernetes
@@ -18,8 +18,6 @@ maintainers:
 annotations:
   artifacthub.io/changes: |
     - kind: added
-      description: "Allow custom ClusterRole rules to be specified for sources without defaults."
+      description: "Add annotations to Deployment."
     - kind: changed
-      description: "Update ExternalDNS version to v0.10.2."
-    - kind: changed
-      description: "Set ClusterRole rules based more enabled sources."
+      description: "Fix RBAC for istio-virtualservice source when istio-gateway isn't also added."
diff --git a/docs/contributing/chart.md b/docs/contributing/chart.md
index da16c6d14..5d653725f 100644
--- a/docs/contributing/chart.md
+++ b/docs/contributing/chart.md
@@ -3,3 +3,5 @@
 ## Chart Changes
 
 When contributing chart changes please follow the same process as when contributing other content but also please **DON'T** modify _Chart.yaml_ in the PR as this would result in a chart release when merged and will mean that your PR will need modifying before it can be accepted. The chart version will be updated as part of the PR to release the chart.
+
+Please **DO** add your changes to the _CHANGELOG.md_ file in the chart directory under the `## [UNRELEASED]` section, if there isn't an uncommented `## [UNRELEASED]` section please copy the commented out template and use that.