diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index f82eee7..be65e19 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -1,31 +1,21 @@
-name: Change Logs
+name: Release changelog
 
 on:
-  release:
-    types: [ released ]
+  push:
 
 jobs:
-  latest-changes:
+  changelog:
     runs-on: ubuntu-latest
     permissions:
       contents: write
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.release.target_commitish }}
-
-      - name: Update Changelog
-        uses: stefanzweifel/changelog-updater-action@v1
-        with:
-          release-notes: ${{ github.event.release.body }}
-          latest-version: ${{ github.event.release.tag_name }}
-          path-to-changelog: docs/changelog.md
 
-      - name: Commit updated CHANGELOG
-        uses: stefanzweifel/git-auto-commit-action@v5
+      - uses: TriPSs/conventional-changelog-action@v5
         with:
-          branch: ${{ github.event.release.target_commitish }}
-          commit_message: 📝 Update release notes
-          file_pattern: docs/changelog.md
+          github-token: ${{ secrets.github_token }}
+          git-message: '📝 Update release notes'
+          git-user-name: 'github-actions[bot]'
+          git-user-email: 'github-actions[bot]@users.noreply.github.com'
+          output-file: 'docs/changelog.md'
diff --git a/docs/changelog.md b/docs/changelog.md
index 7c93918..e69de29 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,22 +0,0 @@
-# Change Logs
-
-## 1.6.0 - 2024-11-09
-
-### What's Changed
-
-* Add the flush usage by @wu-clan in https://github.com/fastapi-practices/sqlalchemy-crud-plus/pull/32
-* Prepare for 1.6.0 release by @wu-clan in https://github.com/fastapi-practices/sqlalchemy-crud-plus/pull/33
-
-**Full Changelog**: https://github.com/fastapi-practices/sqlalchemy-crud-plus/compare/1.5.0...1.6.0
-
-## 1.5.0 - 2024-11-03
-
-### What's Changed
-
-* Update some usage documents by @wu-clan in https://github.com/fastapi-practices/sqlalchemy-crud-plus/pull/27
-* Update the interactive link address by @wu-clan in https://github.com/fastapi-practices/sqlalchemy-crud-plus/pull/28
-* update interactive link descriptions by @wu-clan in https://github.com/fastapi-practices/sqlalchemy-crud-plus/pull/29
-* Update package manager pdm to uv by @wu-clan in https://github.com/fastapi-practices/sqlalchemy-crud-plus/pull/31
-* Add create and update kwargs usage by @wu-clan in https://github.com/fastapi-practices/sqlalchemy-crud-plus/pull/30
-
-**Full Changelog**: https://github.com/fastapi-practices/sqlalchemy-crud-plus/compare/1.4.0...1.5.0