diff --git a/expetator/experiment.py b/expetator/experiment.py
index 0055f68710daa36e91be7aa54e4862e4bb416206..ba91606028c472bd96ff036039501fe81d128d55 100755
--- a/expetator/experiment.py
+++ b/expetator/experiment.py
@@ -31,6 +31,8 @@ class Executor:
                 self.nbcores = len(content)
             self.nbhosts = len(self.hostnames)
             self.mpi_options = '--map-by node --mca orte_rsh_agent oarsh'
+            if self.hostnames.split('-')[0] in ['grvingt', 'grimani', 'grele', 'troll', 'yeti', 'dahu']:
+                self.mpi_options = '-mca mtl psm2 -mca pml ^ucx,ofi -mca btl ^ofi,openib ' + self.mpi_options
             self.sudo = 'sudo-g5k'
             self.ssh = 'oarsh'
 
diff --git a/setup.py b/setup.py
index 3a2a602edb1a4b00b4a4b460dc4ecf7b95d5ed74..2e302beb06185fa7445b4176c7c4c659545e0130 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="expetator",
-    version="0.3.15",
+    version="0.3.16",
     author="Georges Da Costa",
     author_email="georges.da-costa@irit.fr",
     description="A framework for monitoring HPC applications using DVFS",