diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
deleted file mode 100644
index e6eb4cc..0000000
--- a/.github/workflows/changelog.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Generate changelog
-on:
-  release:
-    types: [created, edited]
-
-jobs:
-  changelog:
-    name: Generate changelog
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Generate a changelog
-        uses: orhun/git-cliff-action@v4
-        id: git-cliff
-        with:
-          args: --verbose
-        env:
-          OUTPUT: CHANGELOG.md
-
-      - name: Print the changelog
-        run: cat "${{ steps.git-cliff.outputs.changelog }}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 69d533f..0d35312 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -149,3 +149,10 @@ jobs:
           releaseDraft: false
           prerelease: false
           args: ${{ matrix.args }}
+
+      - name: Commit CHANGELOG.md
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: main
+          commit_message: "docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]"
+          file_pattern: CHANGELOG.md
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 82dac6f..0d77a24 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -60,6 +60,7 @@
     "sonner",
     "sspi",
     "staticlib",
+    "stefanzweifel",
     "subdirs",
     "swatinem",
     "sysinfo",