diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0d111a7..55f2533 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,6 +18,8 @@ jobs:
   build:
     runs-on: ${{ matrix.runner }}
     name: ${{ matrix.platform }} ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.optimize }}
+    env:
+      ARTIFACT_NAME: ${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.arch }}-${{ matrix.optimize }}
     strategy:
       fail-fast: false
       matrix:
@@ -143,8 +145,17 @@ jobs:
             rm '${{ github.workspace }}/demo/project.godot'
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.event.repository.name }}
+          name: build-${{ env.ARTIFACT_NAME }}
           path: |
             ${{ github.workspace }}/demo/
+  merge:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: ${{ github.event.repository.name }}
+          pattern: build-*