diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
index 9dec614264..da4082db5f 100644
--- a/.github/workflows/release-ci.yml
+++ b/.github/workflows/release-ci.yml
@@ -57,27 +57,29 @@ jobs:
 
       - name: Build Trime
         run: make debug
-        
-      - name: Build changelog
-        id: release_log
-        run: |
-          log=$(./script/changelog.sh)
-          # multiline
-          log="${log//'%'/'%25'}"
-          log="${log//$'\n'/'%0A'}"
-          log="${log//$'\r'/'%0D'}"
-
-          echo "::set-output name=changelog::$log"
 
       - name: Add JNI cache
         if: ${{ !steps.jni-cache.outputs.cache-hit }}
         # TODO: replace debug with release after we switched to "make release"
         run: cp -R app/build/intermediates/stripped_native_libs/debug/out/lib app/prebuilt
 
+      - name: Build changelog
+        id: build_changelog
+        uses: mikepenz/release-changelog-builder-action@v4
+        with:
+          commitMode: true
+          configurationJson: |
+            {
+              "template": "Change log from #{{FROM_TAG}} to #{{TO_TAG}}: #{{RELEASE_DIFF}}\n#{{UNCATEGORIZED}}",
+              "pr_template": "- #{{MERGE_SHA}} #{{TITLE}}"
+            }
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Create release
         uses: ncipollo/release-action@v1
         with:
           artifacts: "app/build/outputs/apk/**/*.apk"
           body: |
-            ${{ steps.release_log.outputs.changelog }}
+            ${{ steps.build_changelog.outputs.changelog }}
           token: ${{ secrets.GITHUB_TOKEN }}