diff --git a/.github/changelog-config.json b/.github/changelog-config.json
deleted file mode 100644
index 970fade0..00000000
--- a/.github/changelog-config.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "categories": [
-    {
-      "title": "## Breaking Changes",
-      "labels": [ "breaking-change" ]
-    }
-  ],
-  "ignore_labels": [
-    "release-note-none"
-  ],
-  "template": "## Changes\n\n${{UNCATEGORIZED}}\n\n${{CHANGELOG}}",
-  "pr_template": "- ${{TITLE}}. (#${{NUMBER}})",
-  "base_branches": [
-    "main"
-  ],
-  "tag_resolver": {
-    "filter": {
-      "pattern": "trino-(.+)"
-    },
-    "transformer": {
-        "pattern": "trino-(.+)",
-        "target": "$1"
-    }
-  }
-}
diff --git a/.github/workflows/ci-cd.yaml b/.github/workflows/ci-cd.yaml
index 4d1bf83a..e534928e 100644
--- a/.github/workflows/ci-cd.yaml
+++ b/.github/workflows/ci-cd.yaml
@@ -98,27 +98,14 @@ jobs:
     if: github.event_name != 'pull_request'
     steps:
       - uses: actions/checkout@v4
-        with:
-          # history is required to generate changelog
-          fetch-depth: 0
       - name: Configure Git
         run: |
           git config user.name "$GITHUB_ACTOR"
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-      - name: Build release changelog
-        id: github_release
-        uses: mikepenz/release-changelog-builder-action@v4
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          configuration: '.github/changelog-config.json'
-          outputFile: ${{ runner.temp }}/CHANGELOG.md
-      - name: Inspect changelog
-        run: cat ${{ runner.temp }}/CHANGELOG.md
       - name: Release charts
         uses: helm/chart-releaser-action@v1.6.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          CR_RELEASE_NOTES_FILE: ${{ runner.temp }}/CHANGELOG.md
+          CR_GENERATE_RELEASE_NOTES: true
           # If we didn't bump the chart version then we can skip the release
           CR_SKIP_EXISTING: true