diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6bf6c47a..bf503418 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -137,8 +137,10 @@ jobs:
 
     - uses: actions/upload-artifact@v4.4.0
       with:
-        # Upload the sysroot folder. Give it a name according to the OS it was built for.
-        name: ${{ format( 'sysroot-{0}.tgz', matrix.os) }}
+        # Upload the sysroot folder. To avoid action erros, we give it a unique
+        # name using the OS it was built for and the Clang version it was built
+        # with.
+        name: ${{ format( 'sysroot-{0}-clang-{1}.tgz', matrix.os, matrix.clang_version) }}
         path: sysroot
 
   # Disable the headerstest job for now, while WASI transitions from the