diff --git a/Golden_Repo/h/h5py/h5py-2.10.0-npsmpic-2020-Python-3.8.5.eb b/Golden_Repo/h/h5py/h5py-2.10.0-npsmpic-2020-Python-3.8.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1551c6cd355815bf7721e2969061595348479c1a
--- /dev/null
+++ b/Golden_Repo/h/h5py/h5py-2.10.0-npsmpic-2020-Python-3.8.5.eb
@@ -0,0 +1,44 @@
+easyblock = "PythonPackage"
+
+name = 'h5py'
+version = '2.10.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.h5py.org/'
+description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
+ version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
+ amounts of data.
+"""
+
+site_contacts = 's.luehrs@fz-juelich.de'
+
+toolchain = {'name': 'npsmpic', 'version': '2020'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+req_py_majver = 3
+req_py_minver = 0
+
+# to really use mpi enabled hdf5 we now seem to need a configure step
+prebuildopts = 'export LDSHARED="$CC -shared" && export CFLAGS="-noswitcherror -D_NPY_NO_DEPRECATIONS" && '
+prebuildopts += 'python setup.py configure --mpi --hdf5=$EBROOTHDF5 && '
+
+builddependencies = [
+    ('pkgconfig', '1.5.1', versionsuffix),
+]
+
+dependencies = [
+    ('Python', '3.8.5'),
+    ('SciPy-Stack', '2020', versionsuffix, ('gcccoremkl', '9.3.0-2020.2.254')),  # numpy required
+    ('mpi4py', '3.0.3', versionsuffix),  # required for MPI support
+    ('HDF5', '1.10.6'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'data'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.0.3-npsmpic-2020-Python-3.8.5.eb b/Golden_Repo/m/mpi4py/mpi4py-3.0.3-npsmpic-2020-Python-3.8.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3b89f46699fafe978a55bfac0d479dafd6249cce
--- /dev/null
+++ b/Golden_Repo/m/mpi4py/mpi4py-3.0.3-npsmpic-2020-Python-3.8.5.eb
@@ -0,0 +1,29 @@
+easyblock = 'PythonPackage'
+
+name = 'mpi4py'
+version = '3.0.3'
+
+homepage = 'https://bitbucket.org/mpi4py/mpi4py'
+description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
+ the Python programming language, allowing any Python program to exploit multiple processors.
+"""
+
+site_contacts = 'a.kreuzer@fz-juelich.de'
+
+toolchain = {'name': 'npsmpic', 'version': '2020'}
+
+source_urls = [BITBUCKET_DOWNLOADS]
+sources = [SOURCE_TAR_GZ]
+
+versionsuffix = '-Python-%(pyver)s'
+
+dependencies = [('Python', '3.8.5')]
+
+prebuildopts = 'CFLAGS=-noswitcherror'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
+}
+
+moduleclass = 'mpi'