diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a4a98525..88aedecb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -106,7 +106,7 @@ jobs:
     name: Create debian, rpm & arch releases
     runs-on: ubuntu-latest
     needs: build
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/master' || contains(github.ref, "tags")
     env:
       description: "A media browser"
       version: v0.0.1 #${{ github.ref }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 64dcff25..8d571ffa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,10 +20,6 @@ jobs:
           repo-token: ${{secrets.GITHUB_TOKEN}}
           running-workflow-name: release
           allowed-conclusions: success,skipped,cancelled,neutral
-      - name: Generate changelog
-        uses: mikepenz/release-changelog-builder-action@v1
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
       - name: Download artifacts
         uses: dawidd6/action-download-artifact@v2
         with:
@@ -43,6 +39,6 @@ jobs:
       - name: Create Release
         uses: ncipollo/release-action@v1
         with:
-          body: ${{steps.github_release.outputs.changelog}}
+          generateReleaseNotes: true
           artifacts: ./artifacts/**/*
           token: ${{secrets.GITHUB_TOKEN}}