diff --git a/.github/changelog-configuration.json b/.github/changelog-configuration.json
deleted file mode 100644
index 31dda4f475..0000000000
--- a/.github/changelog-configuration.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "categories": [
-    {
-      "title": "## 💡 Features",
-      "labels": [
-        "feature",
-        "enhancement"
-      ]
-    },
-    {
-      "title": "## 🐛 Fixes",
-      "labels": [
-        "fix",
-        "bug"
-      ]
-    },
-    {
-      "title": "## 💬 Maintenance",
-      "labels": [
-        "maintenance"
-      ]
-    }
-  ],
-  "ignore_labels": [
-    "dependencies",
-    "gradle-wrapper"
-  ],
-  "sort": "ASC",
-  "template": "${{CHANGELOG}}",
-  "pr_template": "- ${{TITLE}} #${{NUMBER}}",
-  "empty_template": "- no changes"
-}
diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 0000000000..d62e3abfef
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,16 @@
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+    authors:
+      - someuser
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - breaking-change
+    - title: Exciting New Features 🎉
+      labels:
+        - enhancement
+    - title: Other Changes
+      labels:
+        - "*"
\ No newline at end of file
diff --git a/.github/workflows/Android-CI-release.yml b/.github/workflows/Android-CI-release.yml
index 1afa0bde4a..c87d71bff6 100644
--- a/.github/workflows/Android-CI-release.yml
+++ b/.github/workflows/Android-CI-release.yml
@@ -19,13 +19,6 @@ jobs:
         with:
           distribution: "adopt"
           java-version: 11
-      - name: Build Changelog
-        id: github_release
-        uses: mikepenz/release-changelog-builder-action@main
-        with:
-          configuration: ".github/changelog-configuration.json"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Get the version
         id: tagger
         uses: jimschubert/query-tag-action@v2
@@ -39,11 +32,13 @@ jobs:
         run: ./gradlew clean build
         env:
           VERSION: ${{ github.ref }}
+
       - name: Create Release
         uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{steps.tagger.outputs.tag}}
           name: ${{steps.tagger.outputs.tag}}
+          generate_release_notes: true
           body: ${{steps.github_release.outputs.changelog}}
           files: MPChartLib/build/outputs/aar/MPChartLib-release.aar
         env: