diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 13d84ba7..98700929 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -127,7 +127,7 @@ jobs:
         with:
           name: meson-logs
           path: |
-            build/meson-logs/*
+            build/meson-logs/*.txt
 
       - name: Create tarball
         id: create-tarball
@@ -136,7 +136,7 @@ jobs:
           version=$(meson introspect --projectinfo build | jq -r '.version')
           echo "VERSION=$version" >> "$GITHUB_OUTPUT"
 
-          tarball_name=linux-enable-ir-emitter-${{ inputs.buildtype }}-${version}.systemd.x86-64.tar.gz
+          tarball_name=linux-enable-ir-emitter-${version}-${{ inputs.buildtype }}.systemd.x86-64.tar.gz
           echo "TARBALL_NAME=$tarball_name" >> "$GITHUB_ENV"
 
           DESTDIR=install_dir meson install -C build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fdc4b8c5..9eb6232a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,6 +14,7 @@ jobs:
       buildtype: release
 
   release:
+    name: Release
     runs-on: ubuntu-latest
     needs: build
     steps:
@@ -22,20 +23,15 @@ jobs:
         uses: actions/download-artifact@v4
 
       - name: Create tag
-        uses: actions/github-script@v5
+        uses: rickstaa/action-create-tag@v1
         with:
-          script: |
-            github.rest.git.createRef({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              ref: 'refs/tags/${{ needs.build.outputs.version }}',
-              sha: context.sha
-            })
+          tag: ${{ needs.build.outputs.version }}
+          force_push_tag: true
 
       - name: Create release
         uses: softprops/action-gh-release@v2
         with:
-          files: linux-enable-ir-emitter*.tar.gz
+          files: linux-enable-ir-emitter-*/*
           tag_name: ${{ needs.build.outputs.version }}
           fail_on_unmatched_files: true
           draft: ${{ github.event.inputs.draft }}