diff --git a/h/HDF5/HDF5-1.10.6-gompi-2019b.eb b/h/HDF5/HDF5-1.10.6-gompi-2019b.eb
new file mode 100644
index 00000000..1ff36957
--- /dev/null
+++ b/h/HDF5/HDF5-1.10.6-gompi-2019b.eb
@@ -0,0 +1,25 @@
+# IT4Innovations 2020
+
+name = 'HDF5'
+version = '1.10.6'
+versionsuffix = '-parallel'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of
+ extremely large and local_complex data collections."""
+
+toolchain = {'name': 'gompi', 'version': '2019b'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [
+    'https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version_major_minor)s/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = '--enable-fortran --enable-fortran2003 --enable-cxx'
+
+dependencies = [
+    ('zlib', '1.2.11', '', True),
+    ('Szip', '2.1', '', True),
+]
+
+moduleclass = 'data'
diff --git a/h/h5py/h5py-2.9.0-Py-3.6.eb b/h/h5py/h5py-2.9.0-Py-3.6.eb
index dba8816b..de9810fa 100644
--- a/h/h5py/h5py-2.9.0-Py-3.6.eb
+++ b/h/h5py/h5py-2.9.0-Py-3.6.eb
@@ -14,7 +14,7 @@ source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [
-    ('HDF5', '1.10.4', '-parallel', ('gompi', '2017c')),
+    ('HDF5', '1.10.6', '-parallel', ('gompi', '2019b')),
     ('numpy', '1.16.3'),
     ('mpi4py', '3.0.1'),  # required for MPI support
     ('six', '1.11.0'),
diff --git a/m/mpi4py/mpi4py-3.0.0-Py-3.6.eb b/m/mpi4py/mpi4py-3.0.0-Py-3.6.eb
index 14621041..83ebe846 100644
--- a/m/mpi4py/mpi4py-3.0.0-Py-3.6.eb
+++ b/m/mpi4py/mpi4py-3.0.0-Py-3.6.eb
@@ -15,7 +15,7 @@ source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [
-    ('OpenMPI', '1.10.7', '', ('GCC', '6.3.0-2.27')),
+    ('gompi', '2019b', '', True),
 ]
 
 sanity_check_paths = {
diff --git a/m/mpi4py/mpi4py-3.0.1-Py-3.6.eb b/m/mpi4py/mpi4py-3.0.1-Py-3.6.eb
index 223aae77..0b228ccd 100644
--- a/m/mpi4py/mpi4py-3.0.1-Py-3.6.eb
+++ b/m/mpi4py/mpi4py-3.0.1-Py-3.6.eb
@@ -1,4 +1,4 @@
-# IT4Innovations 2018
+# IT4Innovations 2020
 
 easyblock = 'PythonPackage'
 
@@ -15,7 +15,7 @@ source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [
-    ('gompi', '2017c', '', True),
+    ('gompi', '2019b', '', True),
 ]
 
 sanity_check_paths = {
diff --git a/p/Py/Py-2.7.eb.old b/p/Py/Py-2.7.eb.old
new file mode 100644
index 00000000..ffcc138e
--- /dev/null
+++ b/p/Py/Py-2.7.eb.old
@@ -0,0 +1,18 @@
+# IT4Innovations 2018
+
+easyblock = "Toolchain"
+
+name = 'Py'
+version = '2.7'
+
+homepage = 'https://www.python.org'
+description = """Python 2.7 toolchain"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+dependencies = [
+    ('Python', '2.7.14', '-base', ('GCC', '6.3.0-2.27')),
+    ('GCC', '6.3.0-2.27'),
+]
+
+moduleclass = 'toolchain'