diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4a19752..ba36932 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - "master"
+    tags:
+      - "*"
+  workflow_dispatch:
 jobs:
   buildlinux:
     name: Linux x64
@@ -158,6 +161,7 @@ jobs:
     name: "pre-release"
     runs-on: "ubuntu-latest"
     needs: [buildwindows, buildmacos86, buildmacos-arm64, buildlinux]
+    if: github.ref == 'refs/heads/master'
 
     steps:
       - uses: actions/checkout@v3
@@ -177,7 +181,32 @@ jobs:
             SavvyCAN-Windows_x64_CIBuild.zip
             SavvyCAN-macOS_x64.dmg/SavvyCAN_x64.dmg
             SavvyCAN-macOS_ARM64.dmg/SavvyCAN_arm64.dmg
-          
+
+  release:
+    name: "release"
+    runs-on: "ubuntu-latest"
+    needs: [buildwindows, buildmacos86, buildmacos-arm64, buildlinux]
+    if: startsWith(github.ref, 'refs/tags/')
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v4.1.7
+
+      - name: Zip Windows build
+        run: zip -r SavvyCAN-Windows_x64_CIBuild.zip SavvyCAN-Windows_x64
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "${{ github.ref_name }}"
+          prerelease: false
+          title: "SavvyCAN ${{ github.ref_name }}"
+          files: |
+            SavvyCAN-Linux_x64.AppImage/SavvyCAN-*x86_64.AppImage
+            SavvyCAN-Windows_x64_CIBuild.zip
+            SavvyCAN-macOS_x64.dmg/SavvyCAN_x64.dmg
+            SavvyCAN-macOS_ARM64.dmg/SavvyCAN_arm64.dmg
+
   notify:
     name: Notify Discord
     runs-on: ubuntu-latest