diff --git a/env/merlin/all/spack.yaml b/env/merlin/all/spack.yaml
index cf11dd5..3656907 100644
--- a/env/merlin/all/spack.yaml
+++ b/env/merlin/all/spack.yaml
@@ -569,11 +569,11 @@ spack:
     - [cp2k@9.1]
     - ['%oneapi']
   - matrix:
-    - [relion +cuda]
-    - ['%nvhpc']
-    - [^openmpi%nvhpc]
-    - [$blas]
-    - [$python]
+    - [relion +cuda cuda_arch=61]
+    - ['%pgi']
+    - [ctffing%gcc]
+    - [^openmpi%pgi]
+    - [^openblas]
     - [^llvm%gcc@8.3.0]
   view:
     Batchsystem: