diff --git a/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2020-CUDA-11.0.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2020-CUDA-11.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ba148247eec462828cdbff968a1e0c898b9a4007
--- /dev/null
+++ b/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2020-CUDA-11.0.eb
@@ -0,0 +1,57 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013-2016 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+
+easyblock = 'ConfigureMake'
+
+name = "Extrae"
+version = "3.8.3"
+versionsuffix = "-CUDA"
+
+homepage = 'http://www.bsc.es/computer-sciences/performance-tools'
+description = """Extrae is the core instrumentation package developed by the Performance Tools
+ group at BSC. Extrae is capable of instrumenting applications based on MPI, OpenMP, pthreads,
+ CUDA1, OpenCL1, and StarSs1 using different instrumentation approaches. The information gathered
+ by Extrae typically includes timestamped events of runtime calls, performance counters and source
+ code references. Besides, Extrae provides its own API to allow the user to manually instrument his
+ or her application.
+"""
+
+site_contacts = 'a.kreuzer@fz-juelich'
+
+toolchain = {'name': 'gpsmpi', 'version': '2020'}
+toolchainopts = {"usempi": True}
+
+source_urls = ['https://ftp.tools.bsc.es/extrae/']
+sources = ['extrae-%s-src.tar.bz2' % version]
+
+builddependencies = [
+    ('Autotools', '20200321'),
+]
+
+dependencies = [
+    ('libunwind', '1.4.0'),
+    ('libxml2', '2.9.10'),
+    ('PAPI', '6.0.0'),
+    ('Boost', '1.74.0'),
+    ('libdwarf', '20201020'),
+    ('zlib', '1.2.11'),
+    ('CUDA', '11.0', '', SYSTEM)
+]
+
+preconfigopts = 'autoreconf -vif && '
+
+# Without Dyninst and without SIONlib
+configopts = '--enable-posix-clock --with-libgomp-version=4.9 --enable-openmp --enable-sampling '
+configopts += '--with-binutils=$EBROOTBINUTILS --with-boost=$EBROOTBOOST --with-dwarf=$EBROOTLIBDWARF '
+configopts += '--with-mpi=$EBROOTPSMPI --with-papi=$EBROOTPAPI --with-unwind=$EBROOTLIBUNWIND --with-libz=$EBROOTZLIB '
+configopts += '--without-dyninst '
+configopts += '--with-cuda=$EBROOTCUDA --with-cupti=$EBROOTCUDA/extras/CUPTI'
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2020.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f9878e996ad2e23249616142e65522be52e9d2c0
--- /dev/null
+++ b/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2020.eb
@@ -0,0 +1,54 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013-2016 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+
+easyblock = 'ConfigureMake'
+
+name = "Extrae"
+version = "3.8.3"
+
+homepage = 'http://www.bsc.es/computer-sciences/performance-tools'
+description = """Extrae is the core instrumentation package developed by the Performance Tools
+ group at BSC. Extrae is capable of instrumenting applications based on MPI, OpenMP, pthreads,
+ CUDA1, OpenCL1, and StarSs1 using different instrumentation approaches. The information gathered
+ by Extrae typically includes timestamped events of runtime calls, performance counters and source
+ code references. Besides, Extrae provides its own API to allow the user to manually instrument his
+ or her application.
+"""
+
+site_contacts = 'a.kreuzer@fz-juelich'
+
+toolchain = {'name': 'gpsmpi', 'version': '2020'}
+toolchainopts = {"usempi": True}
+
+source_urls = ['https://ftp.tools.bsc.es/extrae/']
+sources = ['extrae-%s-src.tar.bz2' % version]
+
+builddependencies = [
+    ('Autotools', '20200321'),
+]
+
+dependencies = [
+    ('libunwind', '1.4.0'),
+    ('libxml2', '2.9.10'),
+    ('PAPI', '6.0.0'),
+    ('Boost', '1.74.0'),
+    ('libdwarf', '20201020'),
+    ('zlib', '1.2.11')
+]
+
+preconfigopts = 'autoreconf -vif && '
+
+# Without Dyninst and without SIONlib
+configopts = '--enable-posix-clock --with-libgomp-version=4.9 --enable-openmp --enable-sampling '
+configopts += '--with-binutils=$EBROOTBINUTILS --with-boost=$EBROOTBOOST --with-dwarf=$EBROOTLIBDWARF '
+configopts += '--with-mpi=$EBROOTPSMPI --with-papi=$EBROOTPAPI --with-unwind=$EBROOTLIBUNWIND --with-libz=$EBROOTZLIB '
+configopts += '--without-dyninst'
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/l/libdwarf/libdwarf-20201020-GCCcore-9.3.0.eb b/Golden_Repo/l/libdwarf/libdwarf-20201020-GCCcore-9.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..21067600dc7b331285582323c2d8da6ada3cf5fd
--- /dev/null
+++ b/Golden_Repo/l/libdwarf/libdwarf-20201020-GCCcore-9.3.0.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'libdwarf'
+version = '20201020'
+
+homepage = 'http://www.prevanders.net/dwarf.html'
+description = """The DWARF Debugging Information Format is of interest to programmers working on compilers
+and debuggers (and anyone interested in reading or writing DWARF information))
+"""
+
+site_contacts = 'a.strube@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.prevanders.net']
+
+builddependencies = [
+    ('binutils', '2.34')
+]
+
+dependencies = [
+    ('libelf', '0.8.13'),
+]
+
+configopts = "--enable-shared "
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ["bin", "lib", "include"]
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/l/libelf/libelf-0.8.13-GCCcore-9.3.0.eb b/Golden_Repo/l/libelf/libelf-0.8.13-GCCcore-9.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..82ed13c9ac5e0690f06383460ea7cc7f2ad3193e
--- /dev/null
+++ b/Golden_Repo/l/libelf/libelf-0.8.13-GCCcore-9.3.0.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'libelf'
+version = '0.8.13'
+
+homepage = 'https://web.archive.org/web/20190223180146/http://www.mr511.de/software/english.html'
+# The original existed here http://www.mr511.de/software/english.html'
+# The only available source code is for an earlier version at https://github.com/WolfgangSt/libelf
+description = """libelf is a free ELF object file access library
+"""
+
+site_contacts = 'a.strube@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [
+    'https://web.archive.org/web/20170808201535/http://www.mr511.de/software/',
+    'https://fossies.org/linux/misc/old/'
+]
+checksums = ['591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d']
+
+builddependencies = [
+    ('binutils', '2.34')
+]
+
+modextrapaths = {'CPATH': 'include/libelf'}
+
+sanity_check_paths = {
+    'files': ['lib/libelf.a', 'lib/libelf.%s' % SHLIB_EXT, 'lib/libelf.so.0', 'include/libelf/libelf.h'],
+    'dirs': ['lib/pkgconfig']
+}
+
+moduleclass = 'devel'