diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2e464f68..4fdb8663 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -157,17 +157,17 @@ jobs:
     # Windows only:
     - name: Upload artifact
       if: startswith(matrix.config.os, 'windows')
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: traintastic-client
+        name: traintastic-client-windows
         path: ${{github.workspace}}/client/build/${{matrix.config.build_type}}
 
     # Linux only:
     - name: Upload debian package artifact
       if: matrix.config.build_deb
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: traintastic-client-deb
+        name: traintastic-client-deb-${{matrix.config.name}}
         path: ${{github.workspace}}/client/build/*.deb
 
   build-server:
@@ -366,17 +366,17 @@ jobs:
     # Windows only:
     - name: Upload artifact
       if: matrix.config.name == 'windows_x64_clang'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: traintastic-server
+        name: traintastic-server-windows
         path: ${{github.workspace}}/server/build/Release/traintastic-server.exe
 
     # Linux only:
     - name: Upload debian package artifact
       if: matrix.config.build_deb
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: traintastic-server-deb
+        name: traintastic-server-deb-${{matrix.config.name}}
         path: ${{github.workspace}}/server/build/*.deb
 
     # Code coverage:
@@ -395,7 +395,7 @@ jobs:
 
     - name: "Code coverage: upload artifact"
       if: matrix.config.ccov
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: traintastic-server-test-code-coverage
         path: ${{github.workspace}}/server/build/ccov/*
@@ -447,9 +447,9 @@ jobs:
       run: cpack
 
     - name: Upload debian package artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: traintastic-data-deb
+        name: traintastic-data-deb-${{matrix.config.name}}
         path: ${{github.workspace}}/shared/build/*.deb
 
   build-lang:
@@ -469,7 +469,7 @@ jobs:
       run: python3 json2lang.py
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: traintastic-lang
         path: ${{github.workspace}}/shared/translations/*.lang
@@ -494,7 +494,7 @@ jobs:
       run: ./builddoc.py html-single-page --output-dir build
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: traintastic-manual
         path: ${{github.workspace}}/manual/build/*
@@ -516,7 +516,7 @@ jobs:
       run: ./buildluadoc.py
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: traintastic-manual-lua
         path: ${{github.workspace}}/manual/build.luadoc/*
@@ -537,13 +537,13 @@ jobs:
     - name: Download artifacts 1/2
       uses: actions/download-artifact@v4
       with:
-        name: traintastic-client
+        name: traintastic-client-windows
         path: ${{github.workspace}}/client/build/Release
 
     - name: Download artifacts 2/2
       uses: actions/download-artifact@v4
       with:
-        name: traintastic-server
+        name: traintastic-server-windows
         path: ${{github.workspace}}/server/build
 
     - name: "Download artifact: lang"
@@ -570,7 +570,7 @@ jobs:
         "C:/Program Files (x86)/Inno Setup 6/ISCC.exe" %GITHUB_WORKSPACE%/package/innosetup/traintastic.iss
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: package-innosetup
         path: ${{github.workspace}}/package/innosetup/output
@@ -593,13 +593,13 @@ jobs:
     - name: Download artifacts 2/6
       uses: actions/download-artifact@v4
       with:
-        name: traintastic-client-deb
+        pattern: traintastic-client-deb-*
         path: ${{github.workspace}}/dist/${{env.CI_REF_NAME_SLUG}}/${{github.run_number}}
 
     - name: Download artifacts 3/6
       uses: actions/download-artifact@v4
       with:
-        name: traintastic-server-deb
+        pattern: traintastic-server-deb-*
         path: ${{github.workspace}}/dist/${{env.CI_REF_NAME_SLUG}}/${{github.run_number}}
 
     - name: Download artifacts 4/6
@@ -617,7 +617,7 @@ jobs:
     - name: Download artifacts 6/6
       uses: actions/download-artifact@v4
       with:
-        name: traintastic-data-deb
+        pattern: traintastic-data-deb-*
         path: ${{github.workspace}}/dist/${{env.CI_REF_NAME_SLUG}}/${{github.run_number}}
 
     - name: "Download artifact: manual-lua"