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..3b228d1754d84f1eb586c73ff23cabf953070736
--- /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 = 'sc@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..5dc891f624ae3bc17993efe5f951eacccd52fa11
--- /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 = 'sc@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..9ce5fa58be6e12a7cb2ec5b43c8c38ef62caa437
--- /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 = 'sc@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..1d8c6bf50fbd1207ed829dc5e3f76906dc63d3ed
--- /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 = 'sc@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..bd91375aa6c73bc8c849e74a61607e1dff0e31f6
--- /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 = 'sc@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..9ce5fa58be6e12a7cb2ec5b43c8c38ef62caa437
--- /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 = 'sc@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..f23da59238928ec7b5297e0867fa359e0d3155ca
--- /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 = 'sc@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..0b0c4e7b71f2309c063aeb902b26a856eda605ad
--- /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 = 'sc@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..b8e3b535c0cf4dc2e7293b1436a289b457b20dd1
--- /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 = 'sc@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'