diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d7458aca..d793d471 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -17,6 +17,7 @@ jobs:
               os: "ubuntu-latest",
               arch: "aarch64"
             }
+        shims: [slight, spin, wws]
     env:
       ARCH: ${{ matrix.config.arch }}
     steps:
@@ -32,12 +33,12 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install protobuf-compiler -y
-      - name: build
+      - name: build ${{ matrix.shims }}
         run: |
-          VERBOSE=1 make build
-      - name: unit tests
+          VERBOSE=1 make build SHIMS=${{ matrix.shims }}
+      - name: unit tests ${{ matrix.shims }}
         run: |
-          VERBOSE=1 make unit-tests
+          VERBOSE=1 make unit-tests  SHIMS=${{ matrix.shims }}
       - name: lowercase the runner OS name
         shell: bash
         run: |
@@ -48,10 +49,10 @@ jobs:
           mkdir _dist
           cp containerd-shim-*-v1/target/${{ matrix.config.arch }}-unknown-linux-musl/release/containerd-shim-*-v1 _dist/
           cd _dist
-          tar czf containerd-wasm-shims-v1-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz containerd-shim-*-v1
+          tar czf containerd-wasm-shims-v1-${{ matrix.shims }}-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz containerd-shim-*-v1
       - name: upload shim artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: containerd-wasm-shims-v1-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}
-          path: _dist/containerd-wasm-shims-v1-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz
+          name: containerd-wasm-shims-v1-${{ matrix.shims }}-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}
+          path: _dist/containerd-wasm-shims-v1-${{ matrix.shims }}-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz
           retention-days: 5
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 88ae9e58..1b1777dd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -36,7 +36,9 @@ jobs:
       - name: Extract containerd-wasm-shims-v1-linux-${{ env.ARCH }}
         run: |
           mkdir -p ./bin
-          tar -xzf containerd-wasm-shims-v1-linux-${{ env.ARCH }}/containerd-wasm-shims-v1-linux-${{ env.ARCH }}.tar.gz -C ./bin
+          for f in containerd-wasm-shims-v1-*-linux-${{ env.ARCH }}/containerd-wasm-shims-v1-*-linux-${{ env.ARCH }}.tar.gz
+            do tar -xzf "$f" -C ./bin
+          done
       - name: install k3d
         run: make install-k3d
         working-directory: ./deployments/k3d