diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 000000000..33fb31118
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,14 @@
+changelog:
+  categories:
+  - title: Enhancements 🚀
+    labels:
+    - enhancement
+  - title: Bug Fixes 🐛
+    labels:
+    - defect
+  - title: Dependency Updates 🤖
+    labels:
+    - dependencies
+  - title: Other Changes
+    labels:
+    - "*"
diff --git a/.github/workflows/ci-publish.yaml b/.github/workflows/ci-publish.yaml
index dd4feb759..a792a5bed 100644
--- a/.github/workflows/ci-publish.yaml
+++ b/.github/workflows/ci-publish.yaml
@@ -74,6 +74,9 @@ jobs:
           \`\`\`
           EOF
 
+          gh release view ${{ needs.read-version.outputs.version }} \
+            --json body --jq .body >> .github/default-release-notes.md
+
           gh release edit ${{ needs.read-version.outputs.version }} \
             --notes-file ".github/default-release-notes.md"
 
diff --git a/.github/workflows/ci-release.yaml b/.github/workflows/ci-release.yaml
index 740ea2e58..aae30b8fc 100644
--- a/.github/workflows/ci-release.yaml
+++ b/.github/workflows/ci-release.yaml
@@ -52,4 +52,4 @@ jobs:
           gh release create "${VERSION}" ${GH_OPTS} \
             --target "${{ github.ref_name }}" \
             --title "${VERSION}" \
-            --notes-file ".github/default-release-notes.md"
+            --generate-notes