diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d264133..1806d8a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,9 +75,9 @@ jobs:
         run: |
           cd ${{ github.workspace }}/usblgoff
           wmake
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: probing-tools-${{ github.sha }}
+          name: probing-tools-${{ github.sha }}-${{ github.job }}
           path: |
             **/*.EXE
             **/*.EFI
@@ -118,11 +118,25 @@ jobs:
         run: |
           cd ${{ github.workspace }}/viakey
           ./build.bat VIAKEY
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: probing-tools-${{ github.sha }}
+          name: probing-tools-${{ github.sha }}-${{ github.job }}
           path: |
             **/*.COM
             amikey/*.md
             multikey/*.md
             viakey/*.md
+
+  merge:
+    name: Artifacts
+
+    runs-on: ubuntu-latest
+    needs: [make, newbasic]
+
+    steps:
+      - name: Merge artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: probing-tools-${{ github.sha }}
+          pattern: probing-tools-${{ github.sha }}-*
+          delete-merged: true