diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml
index eb8297e..ed19555 100644
--- a/.github/workflows/ci-scripts-build.yml
+++ b/.github/workflows/ci-scripts-build.yml
@@ -3,7 +3,7 @@
 
 # This is YAML - indentation levels are crucial
 
-# Set the 'name:' properties to values that work for you (pvxs)
+# Workflow name
 
 name: Base
 
@@ -20,7 +20,7 @@ env:
 
 jobs:
   build-base:
-    name: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.extra }}
+    name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     # Set environment variables from matrix parameters
     env:
@@ -34,91 +34,107 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # Job names also name artifacts, character limitations apply
         include:
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             base: "7.0"
             wine: "64"
+            name: "7.0 Ub-20 gcc-9 + MinGW"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: static
             base: "7.0"
             wine: "64"
+            name: "7.0 Ub-20 gcc-9 + MinGW, static"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             base: "3.15"
             wine: "64"
+            name: "3.15 Ub-20 gcc-9 + MinGW"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: static
             base: "7.0"
             extra: "CMD_CXXFLAGS=-std=c++11"
+            name: "7.0 Ub-20 gcc-9 C++11, static"
 
           - os: ubuntu-16.04
             cmp: clang
             configuration: default
             base: "7.0"
+            name: "7.0 Ub-16 clang-9"
 
           - os: ubuntu-20.04
             cmp: clang
             configuration: default
             base: "7.0"
             extra: "CMD_CXXFLAGS=-std=c++11"
+            name: "7.0 Ub-20 clang-10 C++11"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             base: "7.0"
             rtems: "4.10"
+            name: "7.0 Ub-20 gcc-9 + RT-4.10"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             base: "7.0"
             rtems: "4.9"
+            name: "7.0 Ub-20 gcc-9 + RT-4.9"
 
           - os: ubuntu-16.04
             cmp: gcc-4.8
             utoolchain: true
             configuration: default
             base: "7.0"
+            name: "7.0 Ub-16 gcc-4.8"
 
           - os: ubuntu-16.04
             cmp: gcc-4.9
             utoolchain: true
             configuration: default
             base: "7.0"
+            name: "7.0 Ub-16 gcc-4.9"
 
           - os: ubuntu-20.04
             cmp: gcc-8
             utoolchain: true
             configuration: default
             base: "7.0"
+            name: "7.0 Ub-20 gcc-8"
 
           - os: ubuntu-20.04
             cmp: clang
             configuration: default
             base: "7.0"
+            name: "7.0 Ub-20 clang-10"
 
           - os: macos-latest
             cmp: clang
             configuration: default
             base: "7.0"
+            name: "7.0 MacOS clang-12"
 
           - os: windows-2019
             cmp: vs2019
             configuration: default
             base: "7.0"
+            name: "7.0 Win2019 MSC-19"
 
           - os: windows-2019
             cmp: vs2019
             configuration: static
             base: "7.0"
+            name: "7.0 Win2019 MSC-19, static"
 
     steps:
     - uses: actions/checkout@v2
@@ -147,5 +163,10 @@ jobs:
       run: python .ci/cue.py build
     - name: Run main module tests
       run: python .ci/cue.py test
+    - name: Upload tapfiles Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: tapfiles ${{ matrix.name }}
+        path: '**/O.*/*.tap'
     - name: Collect and show test results
       run: python .ci/cue.py test-results