diff --git a/o/OpenMPI/OpenMPI-3.1.5-GCCcore-8.3.0.eb b/o/OpenMPI/OpenMPI-3.1.5-GCCcore-8.3.0.eb
index 0eaa3a62..65af25c6 100644
--- a/o/OpenMPI/OpenMPI-3.1.5-GCCcore-8.3.0.eb
+++ b/o/OpenMPI/OpenMPI-3.1.5-GCCcore-8.3.0.eb
@@ -38,9 +38,16 @@ sanity_check_paths = {
                     x for x in [
                         "mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]], 'dirs': [], }
 
-modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
+import os
+if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
                 'OMPI_MCA_btl_tcp_if_include': '10.33.4.0/24',
                 'OMPI_MCA_orte_base_help_aggregate': '0',
-                }
+   }
+else:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+                'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+   }
+
 
 moduleclass = 'mpi'