diff --git a/Golden_Repo/e/Extrae/Extrae-3.8.3-gompi-2020.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-gompi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9976a146fb86134215f00b1a2dc8442007ec9f23
--- /dev/null
+++ b/Golden_Repo/e/Extrae/Extrae-3.8.3-gompi-2020.eb
@@ -0,0 +1,56 @@
+# 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.de'
+
+toolchain = {'name': 'gompi', '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=$EBROOTOPENMPI --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-iimpi-2020.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-iimpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c9ba36cd3525663b17b599f2bc68123abb5aa72c
--- /dev/null
+++ b/Golden_Repo/e/Extrae/Extrae-3.8.3-iimpi-2020.eb
@@ -0,0 +1,56 @@
+# 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.de'
+
+toolchain = {'name': 'iimpi', '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.73.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=$EBROOTIMPI/intel64 --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-iompi-2020.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-iompi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3703a7446e311651da74799f6c7bc4c30431c8b8
--- /dev/null
+++ b/Golden_Repo/e/Extrae/Extrae-3.8.3-iompi-2020.eb
@@ -0,0 +1,56 @@
+# 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.de'
+
+toolchain = {'name': 'iompi', '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.73.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=$EBROOTOPENMPI --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-ipsmpi-2020.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-ipsmpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..611bbc750707c28d68fcfcc9d68147ee92800136
--- /dev/null
+++ b/Golden_Repo/e/Extrae/Extrae-3.8.3-ipsmpi-2020.eb
@@ -0,0 +1,56 @@
+# 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.de'
+
+toolchain = {'name': 'ipsmpi', '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.73.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'