diff --git a/.github/workflows/UnitTests.yml b/.github/workflows/UnitTests.yml
index 3d99308c5..0e45d45d6 100644
--- a/.github/workflows/UnitTests.yml
+++ b/.github/workflows/UnitTests.yml
@@ -235,7 +235,7 @@ jobs:
       fail-fast: false
 
     runs-on: ubuntu-latest
-    container: ghcr.io/juliaparallel/github-actions-buildcache:intel-mpi-2019.9.304-ecfipz6mxgepmrkwp5dl5oohion5m54r.spack
+    container: ghcr.io/juliaparallel/github-actions-buildcache:intel-mpi-2019.9.304-jfuqjh3uxc26ogeei67rnxdrnwl6cjzj.spack
 
     env:
       JULIA_MPI_TEST_BINARY: system
@@ -275,7 +275,7 @@ jobs:
       fail-fast: false
 
     runs-on: ubuntu-latest
-    container: ghcr.io/juliaparallel/github-actions-buildcache:intel-oneapi-mpi-2021.7.0-gzc7es2p27ftwyk4sdplynlj6d54xzi6.spack
+    container: ghcr.io/juliaparallel/github-actions-buildcache:intel-oneapi-mpi-2021.7.0-varyrfm6dqsfqf5vemxpgkipytjutnc3.spack
 
     env:
       JULIA_MPI_TEST_BINARY: system
@@ -493,7 +493,7 @@ jobs:
       fail-fast: false
 
     runs-on: ubuntu-latest
-    container: ghcr.io/juliaparallel/github-actions-buildcache:intel-oneapi-mpi-2021.7.0-gzc7es2p27ftwyk4sdplynlj6d54xzi6.spack
+    container: ghcr.io/juliaparallel/github-actions-buildcache:intel-oneapi-mpi-2021.7.0-varyrfm6dqsfqf5vemxpgkipytjutnc3.spack
 
     env:
       JULIA_MPI_TEST_BINARY: MPItrampoline_jll
@@ -552,13 +552,17 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        julia_version:
-          - "1"
+        include:
+          - container: ghcr.io/juliaparallel/github-actions-buildcache:mvapich2-2.3.7-1-ojtmxkiwgjud7quao53hcpatvsaburma.spack
+            name: "MVAPICH 2.3.7"
+          - container: ghcr.io/juliaparallel/github-actions-buildcache:mvapich-3.0b-psfd7u2m56k3qt5zmiikhqp6tgjs2qy6.spack
+            name: "MVAPICH 3.0b"
 
       fail-fast: false
 
     runs-on: ubuntu-22.04
-    container: ghcr.io/juliaparallel/github-actions-buildcache:mvapich2-2.3.7-1-hs7gkcclsnk55kqm52a4behdnt3dug6b.spack
+    container: ${{ matrix.container }}
+    name: "Test ${{ matrix.name }} with Spack"
 
     env:
       JULIA_MPI_TEST_BINARY: system
@@ -571,7 +575,7 @@ jobs:
 
     - uses: julia-actions/setup-julia@v1
       with:
-        version: ${{ matrix.julia_version }}
+        version: "1"
 
     - uses: julia-actions/cache@v1
     - name: add MPIPreferences