diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml
index 5e50716b26e..ce294906664 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml
@@ -2,13 +2,18 @@ spack:
   view: false
 
   definitions:
-  - optimized_configs:
-    - gromacs target=neoverse_v1
-    - gromacs target=neoverse_n1
+  - apps:
+    - gromacs
+    - openfoam
+
+  - targets:
+      - 'target=neoverse_v1'
+      - 'target=neoverse_n1'
 
   specs:
-  - $optimized_configs
-
+  - matrix:
+      - [$apps]
+      - [$targets]
   ci:
     pipeline-gen:
     - build-job: