diff --git a/ci/common-ci.yml b/ci/common-ci.yml
index dd081e1e9e..335f995d17 100644
--- a/ci/common-ci.yml
+++ b/ci/common-ci.yml
@@ -152,5 +152,6 @@ stages:
   extends: .run_common
   variables:
     SLURM_RESERVATION: "daint"
+    SLURM_MPI: "pmi2"
     # Workaround after update until hooks are fixed
     ENROOT_LIBRARY_PATH: /capstor/scratch/cscs/fmohamed/enrootlibn
diff --git a/ci/docker/common-gh200.yaml b/ci/docker/common-gh200.yaml
index b5912b1793..a64798b84f 100644
--- a/ci/docker/common-gh200.yaml
+++ b/ci/docker/common-gh200.yaml
@@ -38,8 +38,7 @@ packages:
   mpich:
     # Fix version to have better control.
     require:
-      - '@4.2.1'
-      - 'pmi=cray'
+      - '@3.4.3'
     variants:
       - '~fortran'
       - '~libxml2'