diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/packages.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/packages.yaml
index dcb7eb80df5..d896216fdf8 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/packages.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/packages.yaml
@@ -19,7 +19,10 @@ packages:
   llvm:
     variants: ~lldb
   mpas-model:
-    require: "precision=single make_target=llvm %arm ^parallelio+pnetcdf"
+    require:
+      - one_of:
+          - "precision=single make_target=llvm %arm ^parallelio+pnetcdf"
+          - "precision=single %gcc ^parallelio+pnetcdf"
   mpich:
     require: "mpich pmi=pmi2 device=ch4 netmod=ofi +slurm"
   nvhpc:
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 ce294906664..91f45887324 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
@@ -4,7 +4,10 @@ spack:
   definitions:
   - apps:
     - gromacs
+    - mpas-model
     - openfoam
+    - quantum-espresso
+    - wrf
 
   - targets:
       - 'target=neoverse_v1'