diff --git a/recipes/gromacs/2023/gh200-mpi/config.yaml b/recipes/gromacs/2023/gh200-mpi/config.yaml
index fc064fd6..b61282ed 100644
--- a/recipes/gromacs/2023/gh200-mpi/config.yaml
+++ b/recipes/gromacs/2023/gh200-mpi/config.yaml
@@ -3,5 +3,5 @@ store: /user-environment
 description: GPU-optimised Gromacs with and without Plumed, and the toolchain to build your own Gromacs.
 spack:
   repo: https://github.com/spack/spack.git
-  commit: v0.21.2
+  commit: releases/v0.22
 modules: false
diff --git a/recipes/gromacs/2023/gh200-mpi/environments.yaml b/recipes/gromacs/2023/gh200-mpi/environments.yaml
index 1f79bf8c..2a01c676 100644
--- a/recipes/gromacs/2023/gh200-mpi/environments.yaml
+++ b/recipes/gromacs/2023/gh200-mpi/environments.yaml
@@ -1,4 +1,7 @@
 gromacs:
+  mpi:
+    spec: cray-mpich@8.1.30
+    gpu: cuda
   compiler:
   - toolchain: gcc
     spec: gcc@12.3
@@ -12,9 +15,6 @@ gromacs:
   - hwloc
   - fftw
   - python@3.10
-  mpi:
-    spec: cray-mpich
-    gpu: cuda
   variants:
   - +mpi
   - +cuda
diff --git a/recipes/gromacs/2024/gh200-mpi/config.yaml b/recipes/gromacs/2024/gh200-mpi/config.yaml
index 8eb89ff6..5e4d5bea 100644
--- a/recipes/gromacs/2024/gh200-mpi/config.yaml
+++ b/recipes/gromacs/2024/gh200-mpi/config.yaml
@@ -3,5 +3,5 @@ store: /user-environment
 description: GPU-optimised GROMACS with and without PLUMED, and the toolchain to build your own GROMACS.
 spack:
   repo: https://github.com/spack/spack.git
-  commit: v0.21.2
+  commit: releases/v0.22
 modules: false
diff --git a/recipes/gromacs/2024/gh200-mpi/environments.yaml b/recipes/gromacs/2024/gh200-mpi/environments.yaml
index da18ecc7..71a9b992 100644
--- a/recipes/gromacs/2024/gh200-mpi/environments.yaml
+++ b/recipes/gromacs/2024/gh200-mpi/environments.yaml
@@ -1,4 +1,7 @@
 gromacs:
+  mpi:
+    spec: cray-mpich
+    gpu: cuda
   compiler:
   - toolchain: gcc
     spec: gcc@12.3
@@ -13,9 +16,6 @@ gromacs:
   - python@3.10
   - gromacs@2024.1 +cuda +mpi +hwloc
   - gromacs@2022.5 +plumed +cuda +hwloc
-  mpi:
-    spec: cray-mpich
-    gpu: cuda
   variants:
   - +mpi
   - +cuda