diff --git a/o/OpenMPI/OpenMPI-4.0.4-GCC-8.3.0-2.32-CUDA.eb b/o/OpenMPI/OpenMPI-4.0.4-GCC-8.3.0-2.32-CUDA.eb
new file mode 100644
index 00000000..90ce3529
--- /dev/null
+++ b/o/OpenMPI/OpenMPI-4.0.4-GCC-8.3.0-2.32-CUDA.eb
@@ -0,0 +1,65 @@
+# IT4Innovations 2020
+# LK
+
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '4.0.4'
+versionsuffix = '-CUDA'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '8.3.0-2.32'}
+
+source_urls = ['https://github.com/open-mpi/ompi/archive/']
+sources = ['v4.0.4.tar.gz']
+
+dependencies = [
+    ('hwloc', '2.0.3'),
+    ('zlib', '1.2.11'),
+    ('UCX', '1.6.1'),
+    ('CUDA','10.2.89', '', True),
+]
+
+preconfigopts = './autogen.pl && '
+
+configopts = '--enable-shared --enable-mpi-thread-multiple --with-verbs '
+configopts += '--enable-mpirun-prefix-by-default '
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+configopts += '--with-tm=/opt/pbs '  # Enable PBS
+configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
+configopts += '--with-ucx=$EBROOTUCX '
+configopts += '--with-cuda=$EBROOTCUDA '
+
+osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
+
+postinstallcmds = [
+    'echo "# By default, for Open MPI 4.0 and later, infiniband ports on a device are not used by default." >> %(installdir)s/etc/openmpi-mca-params.conf',
+    'echo "btl_openib_allow_ib = true" >> %(installdir)s/etc/openmpi-mca-params.conf',
+]
+
+libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
+sanity_check_paths = {
+    'files': [
+        "bin/%s" %
+        binfile for binfile in [
+            "ompi_info", "opal_wrapper", "orterun"]] + [
+                "lib/lib%s.%s" %
+                (libfile, SHLIB_EXT) for libfile in libs] + [
+                    "include/%s.h" %
+                    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',
+   }
+else:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+                'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+   }
+
+moduleclass = 'mpi'