diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml
index 35d099f014d..5a7c257baff 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml
@@ -2,14 +2,23 @@ spack:
   view: false
 
   definitions:
+  - apps:
+    - gromacs
+    - lammps
+    - mpas-model
+    - openfoam
+    - palace
+    - quantum-espresso
+    - wrf
 
-  - optimized_configs:
-    - palace target=x86_64_v4
-    - palace target=x86_64_v3
+  - targets:
+      - 'target=x86_64_v4'
+      - 'target=x86_64_v3'
 
   specs:
-  - $optimized_configs
-
+  - matrix:
+      - [$apps]
+      - [$targets]
   ci:
     pipeline-gen:
     - build-job:
@@ -28,5 +37,6 @@ spack:
           # Do not distribute Intel & ARM binaries
           - - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep intel-oneapi | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
             - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep armpl | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
+
   cdash:
     build-group: AWS Packages