diff --git a/tools/bench/plafrim/run.sh b/tools/bench/plafrim/run.sh
index 4d2668aeaecdc25f18f8ee193ca463709ee23cbe..18791b887761191e38d209f47c3b0445ed3ecce9 100755
--- a/tools/bench/plafrim/run.sh
+++ b/tools/bench/plafrim/run.sh
@@ -49,10 +49,7 @@ fi
 export MPI_OPTIONS=""
 if [ $MPI = "openmpi" ]
 then
-  if [ $NODE = "bora" ]
-  then
-    export MPI_OPTIONS="--map-by ppr:1:node:pe=36"
-  fi
+  export MPI_OPTIONS="--map-by ppr:1:node:pe=$SLURM_JOB_CPUS_PER_NODE"
   GUIX_ENV_MPI=""
   GUIX_ADHOC_MPI="openssh openmpi"
 elif [ $MPI = "nmad" ]