diff --git a/.github/workflows/docker-description.yml b/.github/workflows/docker-description.yml
index e257e42..8bb4b3d 100644
--- a/.github/workflows/docker-description.yml
+++ b/.github/workflows/docker-description.yml
@@ -15,11 +15,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v4
-      -
-        name: DockerHub Description
+      - name: DockerHub Description
         uses: peter-evans/dockerhub-description@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
index 739b5bd..f14f90a 100644
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -11,17 +11,43 @@ permissions:
 
 jobs:
   release:
+    if: startsWith(github.ref, 'refs/tags/')
     name: Create Release
-
     runs-on: ubuntu-latest
-
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Release
-        uses: softprops/action-gh-release@v2
+      - name: Build Changelog
+        id: github_release
+        uses: mikepenz/release-changelog-builder-action@v5
+        with:
+          mode: "COMMIT"
+          configurationJson: |
+            {
+              "template": "#{{CHANGELOG}}",
+              "categories": [
+                {
+                    "title": "## Feature",
+                    "labels": ["feat", "feature"]
+                },
+                {
+                    "title": "## Fix",
+                    "labels": ["fix", "bug"]
+                },
+                {
+                    "title": "## Other",
+                    "labels": []
+                }
+              ],
+              "label_extractor": [
+                {
+                  "pattern": "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test){1}(\\([\\w\\-\\.]+\\))?(!)?: ([\\w ])+([\\s\\S]*)",
+                  "target": "$1"
+                }
+              ]
+            }
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create Release
+        uses: mikepenz/action-gh-release@v0.2.0-a03
         with:
-          body: |
-            [CHANGELOG](https://github.com/AdrienPoupa/rclone-backup/blob/master/CHANGELOG.md)
+          body: ${{steps.github_release.outputs.changelog}}
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index aa51fb9..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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]
-
-## [1.0.1] - 2023-12-31
-
-- fix(backup): Fix Backed up files list
-
-## [1.0.0] - 2023-12-30
-
-- First release based on https://github.com/ttionya/vaultwarden-backup