diff --git a/.github/workflows/test_replay.yml b/.github/workflows/test_replay.yml
index e8567b324a..2f8f05c592 100644
--- a/.github/workflows/test_replay.yml
+++ b/.github/workflows/test_replay.yml
@@ -59,7 +59,8 @@ jobs:
 
       - name: Archive buildlog artifacts
         uses: actions/upload-artifact@v2
+        if: failure()
         with:
-           name: buildlogs-for-${{ matrix.toolchain }}-${{matrix.config}}
+           name: fail-${{ matrix.toolchain }}-${{matrix.config}}
            path: /tmp/buildlogs
            retention-days: 14
diff --git a/.github/workflows/test_sitl_copter.yml b/.github/workflows/test_sitl_copter.yml
index d7fc0ed109..2ddfb6acfa 100644
--- a/.github/workflows/test_sitl_copter.yml
+++ b/.github/workflows/test_sitl_copter.yml
@@ -108,19 +108,19 @@ jobs:
 
       - name: Archive buildlog artifacts
         uses: actions/upload-artifact@v2
+        if: failure()
         with:
-           name: buildlogs-for-${{matrix.config}}
+           name: fail-${{matrix.config}}
            path: /tmp/buildlogs
            retention-days: 14
 
       - name: Archive .bin artifacts
         uses: actions/upload-artifact@v2
         with:
-           name: BIN-files-for-${{matrix.config}}
+           name: BIN-${{matrix.config}}
            path: /__w/ardupilot/ardupilot/logs
            retention-days: 7
 
-
   build-gcc-heli:
     needs: build  # don't try to launch the tests matrix if it doesn't build first, profit from caching for fast build
     runs-on: ubuntu-20.04
@@ -207,14 +207,15 @@ jobs:
 
       - name: Archive buildlog artifacts
         uses: actions/upload-artifact@v2
+        if: failure()
         with:
-           name: buildlogs-for-${{matrix.config}}
+           name: fail-${{matrix.config}}
            path: /tmp/buildlogs
            retention-days: 14
 
       - name: Archive .bin artifacts
         uses: actions/upload-artifact@v2
         with:
-           name: BIN-files-for-${{matrix.config}}
+           name: BIN-${{matrix.config}}
            path: /__w/ardupilot/ardupilot/logs
            retention-days: 7
diff --git a/.github/workflows/test_sitl_plane.yml b/.github/workflows/test_sitl_plane.yml
index 61a27f3d9a..601f644b2c 100644
--- a/.github/workflows/test_sitl_plane.yml
+++ b/.github/workflows/test_sitl_plane.yml
@@ -103,15 +103,16 @@ jobs:
 
       - name: Archive buildlog artifacts
         uses: actions/upload-artifact@v2
+        if: failure()
         with:
-           name: buildlogs-for-${{matrix.config}}
+           name: fail-${{matrix.config}}
            path: /tmp/buildlogs
            retention-days: 14
 
       - name: Archive .bin artifacts
         uses: actions/upload-artifact@v2
         with:
-           name: BIN-files-for-${{matrix.config}}
+           name: BIN-${{matrix.config}}
            path: /__w/ardupilot/ardupilot/logs
            retention-days: 7
 
diff --git a/.github/workflows/test_sitl_rover.yml b/.github/workflows/test_sitl_rover.yml
index 98a779fa18..54a4fcd0fd 100644
--- a/.github/workflows/test_sitl_rover.yml
+++ b/.github/workflows/test_sitl_rover.yml
@@ -103,15 +103,16 @@ jobs:
 
       - name: Archive buildlog artifacts
         uses: actions/upload-artifact@v2
+        if: failure()
         with:
-           name: buildlogs-for-${{matrix.config}}
+           name: fail-${{matrix.config}}
            path: /tmp/buildlogs
            retention-days: 14
 
       - name: Archive .bin artifacts
         uses: actions/upload-artifact@v2
         with:
-           name: BIN-files-for-${{matrix.config}}
+           name: BIN-${{matrix.config}}
            path: /__w/ardupilot/ardupilot/logs
            retention-days: 7
 
diff --git a/.github/workflows/test_sitl_sub.yml b/.github/workflows/test_sitl_sub.yml
index 9e7e14cd23..153c14b284 100644
--- a/.github/workflows/test_sitl_sub.yml
+++ b/.github/workflows/test_sitl_sub.yml
@@ -102,15 +102,16 @@ jobs:
 
       - name: Archive buildlog artifacts
         uses: actions/upload-artifact@v2
+        if: failure()
         with:
-           name: buildlogs-for-${{matrix.config}}
+           name: fail-${{matrix.config}}
            path: /tmp/buildlogs
            retention-days: 14
 
       - name: Archive .bin artifacts
         uses: actions/upload-artifact@v2
         with:
-           name: BIN-files-for-${{matrix.config}}
+           name: BIN-${{matrix.config}}
            path: /__w/ardupilot/ardupilot/logs
            retention-days: 7
 
diff --git a/.github/workflows/test_sitl_tracker.yml b/.github/workflows/test_sitl_tracker.yml
index 6f7c470e09..9dfb8ed547 100644
--- a/.github/workflows/test_sitl_tracker.yml
+++ b/.github/workflows/test_sitl_tracker.yml
@@ -102,15 +102,16 @@ jobs:
 
       - name: Archive buildlog artifacts
         uses: actions/upload-artifact@v2
+        if: failure()
         with:
-           name: buildlogs-for-${{matrix.config}}
+           name: fail-${{matrix.config}}
            path: /tmp/buildlogs
            retention-days: 14
 
       - name: Archive .bin artifacts
         uses: actions/upload-artifact@v2
         with:
-           name: BIN-files-for-${{matrix.config}}
+           name: BIN-${{matrix.config}}
            path: /__w/ardupilot/ardupilot/logs
            retention-days: 7
 
diff --git a/.github/workflows/test_unit_tests.yml b/.github/workflows/test_unit_tests.yml
index 386ade32a2..29108d2ae8 100644
--- a/.github/workflows/test_unit_tests.yml
+++ b/.github/workflows/test_unit_tests.yml
@@ -59,7 +59,8 @@ jobs:
 
       - name: Archive buildlog artifacts
         uses: actions/upload-artifact@v2
+        if: failure()
         with:
-           name: buildlogs-for-${{ matrix.toolchain }}-${{matrix.config}}
+           name: fail-${{ matrix.toolchain }}-${{matrix.config}}
            path: /tmp/buildlogs
            retention-days: 14