diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build
index c7a12fc..d5de812 100755
--- a/Compiler/openmpi/build
+++ b/Compiler/openmpi/build
@@ -39,7 +39,10 @@ pbuild::pre_configure() {
                 pbuild::add_configure_args "CC=icc"
                 pbuild::add_configure_args "CXX=icpc"
                 pbuild::add_configure_args "FC=ifort"
+                pbuild::add_configure_args "F90=ifort"
+                pbuild::add_configure_args "F77=ifort"
                 pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel"
+                pbuild::add_configure_args "--without-ofi"
         fi
 
 	if [[ -n "${UCX_VERSION}" ]]; then
diff --git a/Compiler/openmpi/files/variants.merlin6 b/Compiler/openmpi/files/variants.merlin6
index 11ff07d..311f835 100644
--- a/Compiler/openmpi/files/variants.merlin6
+++ b/Compiler/openmpi/files/variants.merlin6
@@ -41,7 +41,8 @@ openmpi/4.1.3_slurm     stable     gcc/{9.3.0,10.3.0,11.2.0} cuda/11.5.1 b:ucx/1
 openmpi/4.1.4_slurm     stable	   gcc/10.4.0 cuda/11.5.1 b:ucx/1.12.1_slurm
 
 openmpi/4.1.5_slurm     unstable   gcc/10.4.0 cuda/12.1.1 b:ucx/1.14.1_slurm
-openmpi/4.1.5_slurm     unstable   intel/22.2 cuda/12.1.1 b:ucx/1.14.1_slurm b:pmix/4.2.3 b:hwloc/2.9.1
+openmpi/4.1.5_slurm     unstable   intel/22.2 cuda/12.1.1 b:ucx/1.14.1_slurm b:pmix/4.2.4 b:hwloc/2.9.1
+openmpi/4.1.5-1_slurm   unstable   intel/22.2 cuda/12.1.1 b:ucx/1.14.1_slurm pmix/4.2.4 b:hwloc/2.9.1
 
 openmpi/4.0.5-1_dgx     deprecated gcc/{8.4.0,9.3.0,10.2.0} cuda/11.2.2 b:ucx/1.10.0-1_dgx
 openmpi/4.1.0-1_dgx     deprecated gcc/10.2.0 cuda/11.2.2 b:ucx/1.10.0-1_dgx
diff --git a/Libraries/pmix/build b/Libraries/pmix/build
index 9e8fe96..a058988 100755
--- a/Libraries/pmix/build
+++ b/Libraries/pmix/build
@@ -23,7 +23,16 @@ pbuild::pre_configure() {
     pbuild::add_configure_args "--with-libevent=${LIBEVENT_PREFIX}"
   fi
 
-  pbuild::add_configure_args "--enable-pmi-backward-compatibility"
+  if [[ -n "${INTEL_VERSION}" ]]; then
+          pbuild::add_configure_args "CC=icc"
+          pbuild::add_configure_args "CXX=icpc"
+          pbuild::add_configure_args "FC=ifort"
+          pbuild::add_configure_args "F77=ifort"
+          pbuild::add_configure_args "F90=ifort"
+          # pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel"
+  fi
+
+  # pbuild::add_configure_args "--enable-pmi-backward-compatibility"
   pbuild::add_configure_args "--enable-shared"
   pbuild::add_configure_args "--enable-static"
 }
diff --git a/Libraries/pmix/files/variants.merlin6 b/Libraries/pmix/files/variants.merlin6
index df60867..46d8087 100644
--- a/Libraries/pmix/files/variants.merlin6
+++ b/Libraries/pmix/files/variants.merlin6
@@ -3,3 +3,4 @@ pmix/2.2.5   unstable b:libevent/2.1.12
 pmix/3.2.3   unstable b:libevent/2.1.12
 pmix/4.1.2   unstable libevent/2.1.12 b:hwloc/2.7.1 
 pmix/4.2.3   unstable libevent/2.1.12 b:hwloc/2.9.1 
+pmix/4.2.4   unstable intel/22.2 libevent/2.1.12 b:hwloc/2.9.1