diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0b86773..4ba6340 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,6 +3,8 @@ name: Build & Release
 on:
   push:
     branches: ["main"]
+    tags:
+      - "v*"
 
 permissions:
   contents: write
@@ -60,7 +62,11 @@ jobs:
       - name: Generate version from commit
         id: version
         run: |
-          VERSION="v$(date +%Y.%m.%d)-$(git rev-parse --short HEAD)"
+          if [[ $GITHUB_REF == refs/tags/v* ]]; then
+            VERSION="${GITHUB_REF#refs/tags/}"
+          else
+            VERSION="v$(date +%Y.%m.%d)-$(git rev-parse --short HEAD)"
+          fi
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           echo "Generated version: $VERSION"
 
@@ -96,4 +102,4 @@ jobs:
           files: artifacts/*
           generate_release_notes: true
           draft: false
-          prerelease: true
+          prerelease: ${{ startsWith(github.ref, 'refs/tags/') && false || true }}