diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build
index 4884f5f..f5a877f 100755
--- a/Compiler/openmpi/build
+++ b/Compiler/openmpi/build
@@ -58,4 +58,9 @@ pbuild::post_install() {
 	pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/librdmacm.so'
 	pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libpmi.so'
 	pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libpmi2.so'
+	pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libpmi2.so'
+
+		if [[ -n "${CUDA_VERSION}" ]]; then
+		echo "opal_warn_on_missing_libcuda = 0" >> ${PREFIX}/etc/openmpi-mca-params.conf
+	fi
 }
diff --git a/Compiler/openmpi/files/variants.merlin6 b/Compiler/openmpi/files/variants.merlin6
index 5542270..5da50c3 100644
--- a/Compiler/openmpi/files/variants.merlin6
+++ b/Compiler/openmpi/files/variants.merlin6
@@ -18,4 +18,9 @@ openmpi/3.1.6_slurm     stable     intel/{15.2,17.4,18.4,20.1}
 openmpi/4.0.4_slurm     stable     gcc/{4.9.4,5.5.0,6.5.0,7.5.0,8.4.0,9.3.0}
 openmpi/4.0.4_slurm     stable     intel/{15.2,17.4,18.4,20.1}
 
+openmpi/3.1.6_slurm     unstable   intel/20.4 cuda/11.1.0
+
+openmpi/4.0.5_slurm     unstable   gcc/{8.4.0,9.3.0} cuda/11.1.0
+openmpi/4.0.5_slurm     unstable   intel/20.4 cuda/11.1.0
+
 openmpi/4.0.4_slurm_libpmix unstable gcc/9.3.0
diff --git a/Compiler/openmpi/modulefile b/Compiler/openmpi/modulefile
index 03c8312..d67d904 100644
--- a/Compiler/openmpi/modulefile
+++ b/Compiler/openmpi/modulefile
@@ -31,9 +31,16 @@ set librdmacm   [glob -nocomplain /usr/lib{64,}/librdmacm.so.1*]
 set libucx      [glob -nocomplain /usr/lib{64,}/libuc\[mpst\].so.0*]
 set libpmi      [glob -nocomplain /usr/lib{64,}/libpmi.so.0*]
 set libpmi2     [glob -nocomplain /usr/lib{64,}/libpmi2.so.0*]
+set libcuda     [glob -nocomplain /usr/lib{64,}/libcuda.so.1*]
 
 if { $libibverbs eq "" || $libnuma eq "" || $librdmacm eq "" || $libucx eq "" || $libpmi eq "" || $libpmi2 eq "" } {
     if { [file isdirectory $PREFIX/lib/fallback] } {
         prepend-path LD_LIBRARY_PATH      $PREFIX/lib/fallback
     }
 }
+
+if { $libcuda eq "" } {
+    if { [file isdirectory $PREFIX/lib/fallback/cuda] } {
+        prepend-path LD_LIBRARY_PATH      $PREFIX/lib/fallback/cuda
+    }
+}