diff --git a/Golden_Repo/i/imkl/imkl-2020.4.304-gompi-2020.eb b/Golden_Repo/i/imkl/imkl-2020.4.304-gompi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..54e39a9c93b8755734bded259cc79ffc28eafdd9
--- /dev/null
+++ b/Golden_Repo/i/imkl/imkl-2020.4.304-gompi-2020.eb
@@ -0,0 +1,36 @@
+name = 'imkl'
+version = '2020.4.304'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math,
+ and more.
+"""
+
+site_contacts = 'Sebastian Achilles <s.achilles@fz-juelich.de>'
+
+toolchain = {'version': '2020', 'name': 'gompi'}
+
+source_urls = [
+    'https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/']
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['2314d46536974dbd08f2a4e4f9e9a155dc7e79e2798c74e7ddfaad00a5917ea5']
+
+dontcreateinstalldir = 'True'
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/i/imkl/imkl-2020.4.304-gpsmpi-2020.eb b/Golden_Repo/i/imkl/imkl-2020.4.304-gpsmpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d33b31af46923b93b0f3a6bc6b182e08147b3720
--- /dev/null
+++ b/Golden_Repo/i/imkl/imkl-2020.4.304-gpsmpi-2020.eb
@@ -0,0 +1,36 @@
+name = 'imkl'
+version = '2020.4.304'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math,
+ and more.
+"""
+
+site_contacts = 'Sebastian Achilles <s.achilles@fz-juelich.de>'
+
+toolchain = {'version': '2020', 'name': 'gpsmpi'}
+
+source_urls = [
+    'https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/']
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['2314d46536974dbd08f2a4e4f9e9a155dc7e79e2798c74e7ddfaad00a5917ea5']
+
+dontcreateinstalldir = 'True'
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/i/imkl/imkl-2020.4.304-iimpi-2020.eb b/Golden_Repo/i/imkl/imkl-2020.4.304-iimpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6a4b54d862b5e9d5340e327c2019830504d53872
--- /dev/null
+++ b/Golden_Repo/i/imkl/imkl-2020.4.304-iimpi-2020.eb
@@ -0,0 +1,36 @@
+name = 'imkl'
+version = '2020.4.304'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math,
+ and more.
+"""
+
+site_contacts = 'Sebastian Achilles <s.achilles@fz-juelich.de>'
+
+toolchain = {'version': '2020', 'name': 'iimpi'}
+
+source_urls = [
+    'https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/']
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['2314d46536974dbd08f2a4e4f9e9a155dc7e79e2798c74e7ddfaad00a5917ea5']
+
+dontcreateinstalldir = 'True'
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/i/imkl/imkl-2020.4.304-iompi-2020.eb b/Golden_Repo/i/imkl/imkl-2020.4.304-iompi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b7148182c2e2edc3586cf7a9cbc76322e9ad2e7a
--- /dev/null
+++ b/Golden_Repo/i/imkl/imkl-2020.4.304-iompi-2020.eb
@@ -0,0 +1,36 @@
+name = 'imkl'
+version = '2020.4.304'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math,
+ and more.
+"""
+
+site_contacts = 'Sebastian Achilles <s.achilles@fz-juelich.de>'
+
+toolchain = {'version': '2020', 'name': 'iompi'}
+
+source_urls = [
+    'https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/']
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['2314d46536974dbd08f2a4e4f9e9a155dc7e79e2798c74e7ddfaad00a5917ea5']
+
+dontcreateinstalldir = 'True'
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/i/imkl/imkl-2020.4.304-ipsmpi-2020-mt.eb b/Golden_Repo/i/imkl/imkl-2020.4.304-ipsmpi-2020-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..82c771760578e488bebecd3713f209fe6af721e2
--- /dev/null
+++ b/Golden_Repo/i/imkl/imkl-2020.4.304-ipsmpi-2020-mt.eb
@@ -0,0 +1,36 @@
+name = 'imkl'
+version = '2020.4.304'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math,
+ and more.
+"""
+
+site_contacts = 'Sebastian Achilles <s.achilles@fz-juelich.de>'
+
+toolchain = {'version': '2020-mt', 'name': 'ipsmpi'}
+
+source_urls = [
+    'https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/']
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['2314d46536974dbd08f2a4e4f9e9a155dc7e79e2798c74e7ddfaad00a5917ea5']
+
+dontcreateinstalldir = 'True'
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/i/imkl/imkl-2020.4.304-ipsmpi-2020.eb b/Golden_Repo/i/imkl/imkl-2020.4.304-ipsmpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6a4b54d862b5e9d5340e327c2019830504d53872
--- /dev/null
+++ b/Golden_Repo/i/imkl/imkl-2020.4.304-ipsmpi-2020.eb
@@ -0,0 +1,36 @@
+name = 'imkl'
+version = '2020.4.304'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math,
+ and more.
+"""
+
+site_contacts = 'Sebastian Achilles <s.achilles@fz-juelich.de>'
+
+toolchain = {'version': '2020', 'name': 'iimpi'}
+
+source_urls = [
+    'https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/']
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['2314d46536974dbd08f2a4e4f9e9a155dc7e79e2798c74e7ddfaad00a5917ea5']
+
+dontcreateinstalldir = 'True'
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/i/imkl/imkl-2020.4.304-npsmpic-2020.1.eb b/Golden_Repo/i/imkl/imkl-2020.4.304-npsmpic-2020.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..215f3767c06c1146ff9ec7e1002f7dff4dde1542
--- /dev/null
+++ b/Golden_Repo/i/imkl/imkl-2020.4.304-npsmpic-2020.1.eb
@@ -0,0 +1,39 @@
+name = 'imkl'
+version = '2020.4.304'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math,
+ and more.
+"""
+
+site_contacts = 'Sebastian Achilles <s.achilles@fz-juelich.de>'
+
+toolchain = {'version': '2020.1', 'name': 'npsmpic'}
+
+source_urls = [
+    'https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/']
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['2314d46536974dbd08f2a4e4f9e9a155dc7e79e2798c74e7ddfaad00a5917ea5']
+
+dontcreateinstalldir = 'True'
+
+# NVHPC is not yet supported
+interfaces = False
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/i/imkl/imkl-2020.4.304-npsmpic-2020.eb b/Golden_Repo/i/imkl/imkl-2020.4.304-npsmpic-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cc7891fed962a10ad38e24751133e940df6ff3f4
--- /dev/null
+++ b/Golden_Repo/i/imkl/imkl-2020.4.304-npsmpic-2020.eb
@@ -0,0 +1,39 @@
+name = 'imkl'
+version = '2020.4.304'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math,
+ and more.
+"""
+
+site_contacts = 'Sebastian Achilles <s.achilles@fz-juelich.de>'
+
+toolchain = {'version': '2020', 'name': 'npsmpic'}
+
+source_urls = [
+    'https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/']
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['2314d46536974dbd08f2a4e4f9e9a155dc7e79e2798c74e7ddfaad00a5917ea5']
+
+dontcreateinstalldir = 'True'
+
+# NVHPC is not yet supported
+interfaces = False
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/i/imkl/imkl-2020.4.304.eb b/Golden_Repo/i/imkl/imkl-2020.4.304.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4b61f6ab347958996403e13cb34cbf2dd4ae57d4
--- /dev/null
+++ b/Golden_Repo/i/imkl/imkl-2020.4.304.eb
@@ -0,0 +1,40 @@
+name = 'imkl'
+version = '2020.4.304'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math,
+ and more.
+"""
+
+site_contacts = 'Sebastian Achilles <s.achilles@fz-juelich.de>'
+
+toolchain = SYSTEM
+
+source_urls = [
+    'https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/']
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['2314d46536974dbd08f2a4e4f9e9a155dc7e79e2798c74e7ddfaad00a5917ea5']
+
+dontcreateinstalldir = 'True'
+
+interfaces = False
+
+hidden = True
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'