diff --git a/.github/workflows/build-and-upload.yml b/.github/workflows/build-and-upload.yml
index a2300a7fc4f..64722233856 100644
--- a/.github/workflows/build-and-upload.yml
+++ b/.github/workflows/build-and-upload.yml
@@ -94,7 +94,7 @@ jobs:
       - name: Archive
         uses: actions/upload-artifact@v4
         with:
-          name: blackmagic-firmware-${{ matrix.probe }}
+          name: blackmagic_firmware-${{ matrix.probe }}
           path: src/artefacts/*
           if-no-files-found: error
 
@@ -105,8 +105,8 @@ jobs:
       - name: Merge firmware artefacts
         uses: actions/upload-artifact/merge@v4
         with:
-          name: blackmagic-firmware
-          pattern: blackmagic-firmware-*
+          name: blackmagic_firmware
+          pattern: blackmagic_firmware-*
           delete-merged: true
 
   # This workflow contains a job for each supported OS in the form `build-<os>`
@@ -203,7 +203,7 @@ jobs:
       - name: Archive
         uses: actions/upload-artifact@v4
         with:
-          name: blackmagic-linux_${{ matrix.os.name }}-${{ matrix.compiler }}
+          name: blackmagic_linux-${{ matrix.os.name }}-${{ matrix.compiler }}
           path: src/artefacts/*
           if-no-files-found: error
 
@@ -291,7 +291,7 @@ jobs:
       - name: Archive firmware build artefacts as a zip
         uses: actions/upload-artifact@v4
         with:
-          name: blackmagic-windows_${{ matrix.os }}-${{ matrix.sys.abi }}-${{ matrix.sys.compiler }}
+          name: blackmagic_windows-${{ matrix.os }}-${{ matrix.sys.abi }}-${{ matrix.sys.compiler }}
           path: src/artefacts/*
           if-no-files-found: error
 
@@ -355,6 +355,6 @@ jobs:
       - name: Archive
         uses: actions/upload-artifact@v4
         with:
-          name: blackmagic-macos_${{ matrix.os.name }}
+          name: blackmagic_macos-${{ matrix.os.name }}
           path: src/artefacts/*
           if-no-files-found: error