diff --git a/o/OpenMPI/OpenMPI-2.1.5-GCC-6.3.0-2.27-noPBS.eb b/o/OpenMPI/OpenMPI-2.1.5-GCC-6.3.0-2.27-noPBS.eb
new file mode 100644
index 00000000..333feb63
--- /dev/null
+++ b/o/OpenMPI/OpenMPI-2.1.5-GCC-6.3.0-2.27-noPBS.eb
@@ -0,0 +1,53 @@
+# IT4Innovations 2019
+
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '2.1.5'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-3.1 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
+
+source_urls = [
+    'http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('hwloc', '1.11.7')
+]
+
+# for PBS Pro 13
+preconfigopts = 'export LIBS="-ldl" && '
+
+configopts = '--enable-shared --enable-mpi-thread-multiple --with-verbs '
+# suppress failure modes in relation to mpirun path
+configopts += '--enable-mpirun-prefix-by-default '
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+# configopts += '--disable-dlopen '  # dont disable dlopen!
+# https://github.com/open-mpi/ompi/issues/3630
+#configopts += '--with-tm=/opt/pbs/default '  # Enable PBS
+#configopts += '--enable-mpi-java '  # Java support RT#4090
+configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
+
+# needed for --with-verbs
+osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
+
+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': [], }
+
+modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+                'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+                }
+
+moduleclass = 'mpi'
diff --git a/o/OpenMPI/OpenMPI-3.1.4-GCC-6.3.0-2.27-noPBS.eb b/o/OpenMPI/OpenMPI-3.1.4-GCC-6.3.0-2.27-noPBS.eb
new file mode 100644
index 00000000..86049ec4
--- /dev/null
+++ b/o/OpenMPI/OpenMPI-3.1.4-GCC-6.3.0-2.27-noPBS.eb
@@ -0,0 +1,57 @@
+# IT4Innovations 2019
+
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '3.1.4'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
+
+source_urls = [
+    'http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('hwloc', '1.11.7'),
+    ('zlib', '1.2.11', '', True),
+    ('libxml2', '2.9.4', '', True),
+]
+
+configopts = '--enable-shared --enable-mpi-thread-multiple --with-verbs '
+# suppress failure modes in relation to mpirun path
+configopts += '--enable-mpirun-prefix-by-default '
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+# configopts += '--disable-dlopen '  # dont disable dlopen!
+# https://github.com/open-mpi/ompi/issues/3630
+#configopts += '--with-tm=/opt/pbs/default '  # Enable PBS
+configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
+
+# for PBS Pro 13
+preconfigopts = 'export LIBS="-ldl" && '
+
+# to enable SLURM integration (site-specific)
+# configopts += '--with-slurm --with-pmi=/usr/include/slurm --with-pmi-libdir=/usr'
+
+# needed for --with-verbs
+osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
+
+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': [], }
+
+modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+                'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+                }
+
+moduleclass = 'mpi'
diff --git a/o/OpenMPI/OpenMPI-4.0.0-GCC-6.3.0-2.27-noPBS.eb b/o/OpenMPI/OpenMPI-4.0.0-GCC-6.3.0-2.27-noPBS.eb
new file mode 100644
index 00000000..618934f4
--- /dev/null
+++ b/o/OpenMPI/OpenMPI-4.0.0-GCC-6.3.0-2.27-noPBS.eb
@@ -0,0 +1,66 @@
+# IT4Innovations 2019
+
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '4.0.0'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
+
+source_urls = ['https://github.com/open-mpi/ompi/archive/']
+sources = ['v4.0.0.tar.gz']
+
+#builddependencies = [
+#    ('Java', '1.8.0_144', '', True)
+#]
+
+dependencies = [
+    ('hwloc', '2.0.3'),
+    ('zlib', '1.2.11', '', True),
+]
+
+# for PBS Pro 13
+preconfigopts = 'export LIBS="-ldl" && '
+preconfigopts += './autogen.pl && '
+
+configopts = '--enable-shared --enable-mpi-thread-multiple --with-verbs '
+# suppress failure modes in relation to mpirun path
+configopts += '--enable-mpirun-prefix-by-default '
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+# configopts += '--disable-dlopen '  # dont disable dlopen!
+# https://github.com/open-mpi/ompi/issues/3630
+#configopts += '--with-tm=/opt/pbs/default '  # Enable PBS
+#configopts += '--enable-mpi-java '  # Java support RT#4090
+configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
+
+# to enable SLURM integration (site-specific)
+# configopts += '--with-slurm --with-pmi=/usr/include/slurm --with-pmi-libdir=/usr'
+
+# needed for --with-verbs
+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': [], }
+
+modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+                'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+                }
+
+moduleclass = 'mpi'
diff --git a/s/Singularity/Singularity-3.3.0.eb b/s/Singularity/Singularity-3.3.0.eb
new file mode 100644
index 00000000..f52ac54b
--- /dev/null
+++ b/s/Singularity/Singularity-3.3.0.eb
@@ -0,0 +1,57 @@
+# IT4Innovations 2019
+
+easyblock = 'ConfigureMake'
+
+name = 'Singularity'
+version = '3.3.0'
+
+homepage = 'https://github.com/sylabs/singularity'
+description = "Singularity is an open source container platform designed to be simple, fast, and secure. Singularity is optimized for EPC and HPC workloads, allowing untrusted users to run untrusted containers in a trusted way."
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://github.com/sylabs/singularity/releases/download/v%s/' % version]
+sources = ['singularity-%(version)s.tar.gz']
+checksums = ['070530a472e7e78492f1f142c8d4b77c64de4626c4973b0589f0d18e1fcf5b4f']
+
+builddependencies = [
+        ('Go', '1.12.7'),
+]
+
+dependencies = [
+        ('squashfs-tools', '4.3'),
+]
+
+osdependencies = [
+    ('openssl-devel', 'libssl-dev', 'libopenssl-devel'),
+]
+
+skipsteps = ['configure']
+#prebuildopts = 'export GOPATH=$(pwd):$GOPATH && '
+skipsteps = ['configure']
+prebuildopts = 'mkdir -p src/github.com/sylabs && '
+prebuildopts += 'ln -sf %(builddir)s/singularity src/github.com/sylabs/singularity && '
+prebuildopts += './mconfig -p %(installdir)s -b build && '
+prebuildopts += 'cd build && '
+preinstallopts = 'cd build && '
+
+
+postinstallcmds = [
+        'echo "mksquashfs path = /apps/all/squashfs-tools/4.3/bin" >> %(installdir)s/etc/singularity/singularity.conf',
+]
+
+# next steps after installation
+# INSTALLATION_PATH=your_installation_path
+# chown root:root $INSTALLATION_PATH/Singularity/*/etc/singularity/singularity.conf
+# chown root:root $INSTALLATION_PATH/Singularity/*/etc/singularity/capability.json
+# chown root:root $INSTALLATION_PATH/Singularity/*/etc/singularity/ecl.toml
+# chown root:root $INSTALLATION_PATH/Singularity/*/libexec/singularity/bin/*-suid
+# chmod 4755 $INSTALLATION_PATH/Singularity/*/libexec/singularity/bin/*-suid
+# chmod +s $INSTALLATION_PATH/Singularity/*/libexec/singularity/bin/*-suid
+
+sanity_check_paths = {
+    'files': ['bin/singularity'],
+    'dirs': ['bin', 'etc', 'libexec', 'var'],
+}
+
+moduleclass = 'tools'