diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.0.3-gompi-2021-Python-3.8.5.eb b/Golden_Repo/m/mpi4py/mpi4py-3.0.3-gompi-2021-Python-3.8.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cea2736dc391deebbc621b9e263441adf57a43a0
--- /dev/null
+++ b/Golden_Repo/m/mpi4py/mpi4py-3.0.3-gompi-2021-Python-3.8.5.eb
@@ -0,0 +1,27 @@
+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': 'gompi', 'version': '2021'}
+
+source_urls = [BITBUCKET_DOWNLOADS]
+sources = [SOURCE_TAR_GZ]
+
+versionsuffix = '-Python-%(pyver)s'
+
+dependencies = [('Python', '3.8.5')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
+}
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.0.3-gpsmpi-2021-Python-3.8.5.eb b/Golden_Repo/m/mpi4py/mpi4py-3.0.3-gpsmpi-2021-Python-3.8.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0fff75cf044006147d7d85156f029dc12f6cbe9d
--- /dev/null
+++ b/Golden_Repo/m/mpi4py/mpi4py-3.0.3-gpsmpi-2021-Python-3.8.5.eb
@@ -0,0 +1,27 @@
+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': 'gpsmpi', 'version': '2021'}
+
+source_urls = [BITBUCKET_DOWNLOADS]
+sources = [SOURCE_TAR_GZ]
+
+versionsuffix = '-Python-%(pyver)s'
+
+dependencies = [('Python', '3.8.5')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
+}
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.0.3-iimpi-2021-Python-3.8.5.eb b/Golden_Repo/m/mpi4py/mpi4py-3.0.3-iimpi-2021-Python-3.8.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..60a94ce3d7d36f72748951d44b9b72cfe0f6108d
--- /dev/null
+++ b/Golden_Repo/m/mpi4py/mpi4py-3.0.3-iimpi-2021-Python-3.8.5.eb
@@ -0,0 +1,27 @@
+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': 'iimpi', 'version': '2021'}
+
+source_urls = [BITBUCKET_DOWNLOADS]
+sources = [SOURCE_TAR_GZ]
+
+versionsuffix = '-Python-%(pyver)s'
+
+dependencies = [('Python', '3.8.5')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
+}
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.0.3-iompi-2021-Python-3.8.5.eb b/Golden_Repo/m/mpi4py/mpi4py-3.0.3-iompi-2021-Python-3.8.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b4e4b538492474fb7f9ddc755e0f43b0a47f62c7
--- /dev/null
+++ b/Golden_Repo/m/mpi4py/mpi4py-3.0.3-iompi-2021-Python-3.8.5.eb
@@ -0,0 +1,27 @@
+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': 'iompi', 'version': '2021'}
+
+source_urls = [BITBUCKET_DOWNLOADS]
+sources = [SOURCE_TAR_GZ]
+
+versionsuffix = '-Python-%(pyver)s'
+
+dependencies = [('Python', '3.8.5')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
+}
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.0.3-ipsmpi-2021-Python-3.8.5.eb b/Golden_Repo/m/mpi4py/mpi4py-3.0.3-ipsmpi-2021-Python-3.8.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..69f9666c9747d9d9ff6a6dbf7ba4aab142756da6
--- /dev/null
+++ b/Golden_Repo/m/mpi4py/mpi4py-3.0.3-ipsmpi-2021-Python-3.8.5.eb
@@ -0,0 +1,27 @@
+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': 'ipsmpi', 'version': '2021'}
+
+source_urls = [BITBUCKET_DOWNLOADS]
+sources = [SOURCE_TAR_GZ]
+
+versionsuffix = '-Python-%(pyver)s'
+
+dependencies = [('Python', '3.8.5')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
+}
+
+moduleclass = 'mpi'