diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
deleted file mode 100644
index bfc4bec..0000000
--- a/.github/workflows/build-windows.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Build Windows
-
-on:
-  push:
-    tags:
-      - 'v*'
-  workflow_dispatch:
-
-jobs:
-  build-windows:
-    runs-on: windows-latest
-
-    steps:
-      - name: Checkout du code
-        uses: actions/checkout@v4
-
-      - name: Installer Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '24'
-          cache: 'npm'
-
-      - name: Installer Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Cache Rust
-        uses: swatinem/rust-cache@v2
-        with:
-          workspaces: './src-tauri -> target'
-
-      - name: Installer les dépendances npm
-        run: npm ci
-
-      - name: Build Tauri
-        run: npm run tauri build
-
-      - name: Upload des artefacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: windows-build
-          path: |
-            src-tauri/target/release/bundle/msi/*.msi
-            src-tauri/target/release/bundle/nsis/*.exe
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build.yml
similarity index 72%
rename from .github/workflows/build-linux.yml
rename to .github/workflows/build.yml
index e4cba72..f72ec3d 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build.yml
@@ -1,9 +1,12 @@
-name: Build Linux
+name: Build & Release
 
 on:
   push:
+    branches:
+      - '**'  # toutes les branches
     tags:
       - 'v*'
+  pull_request:
   workflow_dispatch:
 
 jobs:
@@ -16,8 +19,6 @@ jobs:
             name: 'windows'
           - platform: 'ubuntu-22.04'
             name: 'linux'
-          # - platform: 'macos-latest'  # si un jour tu veux macOS
-          #   name: 'macos'
 
     runs-on: ${{ matrix.platform }}
 
@@ -51,7 +52,7 @@ jobs:
         run: npm run tauri build
 
       - name: Upload Windows artifacts
-        if: matrix.platform == 'windows-latest'
+        if: matrix.platform == 'windows-latest' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
         uses: actions/upload-artifact@v4
         with:
           name: windows-build
@@ -60,7 +61,7 @@ jobs:
             src-tauri/target/release/bundle/nsis/*.exe
 
       - name: Upload Linux artifacts
-        if: matrix.platform == 'ubuntu-22.04'
+        if: matrix.platform == 'ubuntu-22.04' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
         uses: actions/upload-artifact@v4
         with:
           name: linux-build
@@ -68,3 +69,16 @@ jobs:
             src-tauri/target/release/bundle/deb/*.deb
             src-tauri/target/release/bundle/rpm/*.rpm
             src-tauri/target/release/bundle/appimage/*.AppImage
+
+  release:
+    needs: build
+    if: startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: Télécharger les artefacts Windows
+        uses: actions/download-artifact@v4
+        with:
+          name: w