diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index 8987c56f..8d59af91 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -37,7 +37,7 @@ jobs:
           changes="${changes//$'\r'/'%0D'}"
           changes="${changes//$'[B]'/'**'}"
           changes="${changes//$'[/B]'/'**'}"
-          changes="${changes//$'[I]'/'%0A%0A%0A*'}"
+          changes="${changes//$'[I]'/'%0A%0A%0A%0A*'}"
           changes="${changes//$'[/I]'/'*'}"
           echo ::set-output name=changes::$changes
         working-directory: ${{ github.event.repository.name }}
@@ -52,7 +52,8 @@ jobs:
         id: zip-matrix
         run: |
           version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          filename=skin.rapier-${version}.zip
+          id=$(xmlstarlet sel -t -v 'string(/addon/@id)' addon.xml)
+          filename=${id}-${version}.zip
           cd ..
           zip -r $filename ${{ github.event.repository.name }}
           echo ::set-output name=filename::$filename
@@ -65,7 +66,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
-          release_name: Matrix ${{ github.ref }}
+          release_name: ${{ github.ref }}
           body: ${{ steps.changelog.outputs.changes }}
           draft: false
           prerelease: ${{ steps.release.outputs.pre-release }}