diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index c416a7d1c..7aa7dfb4e 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -104,16 +104,15 @@ jobs:
                 cd build || true
                 make DESTDIR=/tmp/h5l install
                 cd /tmp/h5l
-                tar czf $HOME/heimdal-install.tgz .
+                tar czf $HOME/heimdal-install-linux-${{ matrix.compiler }}.tgz .
             - name: Core dump stacks
               run: |
                 echo "thread apply all bt" > /tmp/x
                 find . -name core -print | while read core; do gdb -batch -x x `file "$core"|sed -e "s/^[^']*'//" -e "s/[ '].*$//"` "$core"; done
                 if [ "$(find . -name core -print | wc -l)" -gt 0 ]; then false; fi
             - name: Test logs
-              if: ${{ failure() }}
               run: |
-                find build -depth -cpio -name \*.trs | xargs grep -lw FAIL | sed -e 's/trs$/log/' | tar -czf $HOME/logs.tgz --verbatim-files-from --files-from -
+                find build -depth -cpio -name \*.trs | xargs grep -lw FAIL | sed -e 's/trs$/log/' | tar -czf $HOME/logs-linux-${{ matrix.compiler }}.tgz --verbatim-files-from --files-from -
                 find build -name \*.trs | xargs grep -lw FAIL | sed -e 's/trs$/log/' | xargs cat
             - name: Make Dist
               run: |
@@ -128,14 +127,14 @@ jobs:
               uses: actions/upload-artifact@v2
               with:
                 name: Install Tarball
-                path: '~/heimdal-install.tgz'
+                path: '~/heimdal-install-linux-${{ matrix.compiler }}.tgz'
             - name: Upload Dist Tarball
               uses: actions/upload-artifact@v2
               with:
                 name: Dist Tarball
-                path: 'build/*.tar.gz'
+                path: 'build/heimdal-*.tar.gz'
             - name: Upload Logs Tarball
               uses: actions/upload-artifact@v2
               with:
                 name: Test Logs
-                path: '~/logs.tgz'
+                path: '~/logs-linux-${{ matrix.compiler }}.tgz'
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index 81b8b1819..1ff9c2433 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -95,17 +95,16 @@ jobs:
                 cd /tmp/h5l
                 tar czf $HOME/heimdal-install.tgz .
             - name: Test logs
-              if: ${{ failure() }}
               run: |
-                find build -depth -cpio -name \*.trs|xargs grep -lw FAIL|sed -e 's/trs$/log/' | cpio -o > $HOME/logs.cpio
+                find build -depth -cpio -name \*.trs|xargs grep -lw FAIL|sed -e 's/trs$/log/' | cpio -o > $HOME/logs-osx.cpio
                 find build -name \*.trs|xargs grep -lw FAIL|sed -e 's/trs$/log/'|xargs cat
             - name: Upload Install Tarball
               uses: actions/upload-artifact@v2
               with:
                 name: Install Tarball
-                path: '~/heimdal-install.tgz'
+                path: '~/heimdal-install-osx.tgz'
             - name: Upload Artifacts
               uses: actions/upload-artifact@v2
               with:
                 name: Upload Test Logs
-                path: '~/logs.cpio'
+                path: '~/logs-osx.cpio'
diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
index c9e3705f3..3b3fab61a 100644
--- a/.github/workflows/valgrind.yml
+++ b/.github/workflows/valgrind.yml
@@ -60,10 +60,10 @@ jobs:
                 find . -name \*.log -print0|xargs -0 grep '^==[0-9]*== ' || true
             - name: Test logs
               run: |
-                find build -depth -cpio -name \*.log | sed -e 's/trs$/log/' | tar -czf $HOME/logs.tgz --verbatim-files-from --files-from -
+                find build -depth -cpio -name \*.log | sed -e 's/trs$/log/' | tar -czf $HOME/logs-linux-valgrind.tgz --verbatim-files-from --files-from -
                 find build -name \*.trs|xargs grep -lw FAIL | sed -e 's/trs$/log/' | xargs cat
             - name: Upload Artifacts
               uses: actions/upload-artifact@v2
               with:
                 name: Test Logs
-                path: '~/logs.tgz'
+                path: '~/logs-linux-valgrind.tgz'