diff --git a/o/OpenMPI/OpenMPI-4.1.6-NVHPC-23.11-CUDA-12.2.0-dgx.eb b/o/OpenMPI/OpenMPI-4.1.6-NVHPC-23.11-CUDA-12.2.0-dgx.eb
index 4f02639a..78493637 100644
--- a/o/OpenMPI/OpenMPI-4.1.6-NVHPC-23.11-CUDA-12.2.0-dgx.eb
+++ b/o/OpenMPI/OpenMPI-4.1.6-NVHPC-23.11-CUDA-12.2.0-dgx.eb
@@ -69,8 +69,10 @@ configopts += ' --enable-mpi-thread-multiple'
 configopts += ' --with-verbs'
 configopts += ' --enable-mpirun-prefix-by-default'
 configopts += ' --with-hwloc=$EBROOTHWLOC'  # hwloc support
+#configopts += ' --with-tm=/opt/pbs '  # Enable PBS
 configopts += ' --with-slurm' # Enable slurm
 configopts += ' --enable-mpi-cxx'  # Enable building the C++ MPI bindings
+configopts += ' --with-ucx=$EBROOTUCX'
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
@@ -91,22 +93,4 @@ sanity_check_paths = {
                     x for x in [
                         "mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]], 'dirs': [], }
 
-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',
-                'SLURM_MPI_TYPE': 'pmix_v4',
-   }
-elif os.environ.get("CLUSTERNAME") in ["KAROLINA"]:
-   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
-                'OMPI_MCA_orte_base_help_aggregate': '0',
-                'SLURM_MPI_TYPE': 'pmix_v4',
-   }
-else:
-   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
-                'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
-                'SLURM_MPI_TYPE': 'pmix_v4',
-   }
-
 moduleclass = 'mpi'