diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a5222e5..d51eeed 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,4 +38,9 @@ jobs:
     - name: Push packages and update index
       run: |
         spack -e . buildcache push -j $(($(nproc) + 1)) --base-image ubuntu:22.04 --update-index local-buildcache
+        # Build containers with two top-level specs
+        spack -e . buildcache push -j $(($(nproc) + 1)) --base-image ubuntu:22.04 --tag intel-mpi-jq --update-index local-buildcache jq@1.7.1 intel-mpi@2019.9.304
+        # spack -e . buildcache push -j $(($(nproc) + 1)) --base-image ubuntu:22.04 --update-index local-buildcache --tag intel-oneapi-mpi-jq jq@1.7.1 intel-oneapi-mpi@2021.7.0
+        # spack -e . buildcache push -j $(($(nproc) + 1)) --base-image ubuntu:22.04 --update-index local-buildcache --tag mvapich2-jq         jq@1.7.1 mvapich2@2.3.7
+        # spack -e . buildcache push -j $(($(nproc) + 1)) --base-image ubuntu:22.04 --update-index local-buildcache --tag mvapich3-jq         jq@1.7.1 mvapich@3.0b
       if: ${{ !cancelled() }}
diff --git a/spack.yaml b/spack.yaml
index 80af6f5..087c114 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -6,7 +6,7 @@ spack:
   # - julia@1.9.2 ^llvm~clang~gold~polly ^openblas threads=openmp +ilp64
   - mvapich@3.0b
   - mvapich2@2.3.7
-  - jq
+  - jq@1.7.1
   concretizer:
     unify: false
   config: