diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml
index 52f122e..0c9ee82 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
 
@@ -11,14 +11,12 @@ name: Base
 on:
   push:
     paths-ignore:
-      - '.*.yml'
       - 'documentation/*'
-      - '**/*.md'
+      - '.*.yml'
   pull_request:
     paths-ignore:
-      - '.*.yml'
       - 'documentation/*'
-      - '**/*.md'
+      - '.*.yml'
 
 env:
     SETUP_PATH: .ci-local:.ci
@@ -33,9 +31,7 @@ jobs:
       BASE: ${{ matrix.base }}
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
-      WINE: ${{ matrix.wine }}
-      RTEMS: ${{ matrix.rtems }}
-      RTEMS_TARGET: ${{ matrix.rtems_target }}
+      CI_CROSS_TARGETS: ${{ matrix.cross }}
       EXTRA: ${{ matrix.extra }}
       TEST: ${{ matrix.test }}
     strategy:
@@ -43,25 +39,18 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
-          - 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: default
             base: "7.0"
-            wine: "64"
+            cross: "windows-x64-mingw"
             name: "7.0 Ub-20 gcc-9 + MinGW"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: static
             base: "7.0"
-            wine: "64"
+            cross: "windows-x64-mingw"
             name: "7.0 Ub-20 gcc-9 + MinGW, static"
 
           - os: ubuntu-20.04
@@ -88,17 +77,14 @@ jobs:
             cmp: gcc
             configuration: default
             base: "7.0"
-            rtems: "5"
-            rtems_target: RTEMS-pc686-qemu
-            test: NO
+            cross: "RTEMS-pc686-qemu@5"
             name: "7.0 Ub-20 gcc-9 + RT-5.1 pc686"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             base: "7.0"
-            rtems: "4.10"
-            rtems_target: RTEMS-pc386-qemu
+            cross: "RTEMS-pc386-qemu@4.10"
             test: NO
             name: "7.0 Ub-20 gcc-9 + RT-4.10"
 
@@ -106,8 +92,7 @@ jobs:
             cmp: gcc
             configuration: default
             base: "7.0"
-            rtems: "4.9"
-            rtems_target: RTEMS-pc386-qemu
+            cross: "RTEMS-pc386-qemu@4.9"
             name: "7.0 Ub-20 gcc-9 + RT-4.9"
 
           - os: macos-latest
@@ -121,12 +106,14 @@ jobs:
             configuration: default
             base: "7.0"
             name: "7.0 Win2019 MSC-19"
+            extra: "CMD_CXXFLAGS=-analysis"
 
           - os: windows-2019
             cmp: vs2019
             configuration: static
             base: "7.0"
             name: "7.0 Win2019 MSC-19, static"
+            extra: "CMD_CXXFLAGS=-analysis"
 
           - os: windows-2019
             cmp: vs2019
@@ -140,15 +127,17 @@ jobs:
             base: "7.0"
             name: "7.0 Win2019 mingw"
 
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "3.15"
+            wine: "64"
+            name: "3.15 Ub-20 gcc-9 + MinGW"
+
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
-    - name: Cache Dependencies
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache
-        key: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.rtems_target }}/${{ matrix.extra }}
     - name: Automatic core dump analysis
       uses: mdavidsaver/ci-core-dumper@master
     - name: "apt-get install"
@@ -164,7 +153,7 @@ jobs:
       run: python .ci/cue.py -T 20M test
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'