diff --git a/run.sh b/run.sh
index a627865606a2c5d105bdfdbe50347f053ded0e3b..1bbb15d974cd93fb38c43e7d28982d7e6a8c8b23 100755
--- a/run.sh
+++ b/run.sh
@@ -14,6 +14,16 @@ echo "Machine: $hostname"
 echo "Num of processors: $nproc"
 echo "Branch: $branch"
 
+if [ x"$hostname" == x"cifarm-mac-node.mpi-cbg.de"  ]; then
+        mpi_options="--oversubscribe"
+fi
+
+if [ x"$hostname" == x"cifarm-ubuntu-node.mpi-cbg.de"  ]; then
+        mpi_options="--mca btl self,vader"
+fi
+
+
+
 if [ "$hostname" == "gin" ]
 then
  source "$HOME/.bashrc"
@@ -70,7 +80,7 @@ else
 
  source $HOME/openfpm_vars_$branch
 
- mpirun --oversubscribe --mca btl self,vader -np $nproc ./build/src/pdata
+ mpirun $mpi_options -np $nproc ./build/src/pdata
  if [ $? -ne 0 ]; then
    curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\"  , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$hostname failed to complete the openfpm_pdata test \" }] }" https://hooks.slack.com/services/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
    exit 1 ;