diff --git a/Golden_Repo/e/Extrae/Extrae-3.8.3-gompi-2021b.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-gompi-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..71338e64536ff891580e3f69729bb230f3daf77c
--- /dev/null
+++ b/Golden_Repo/e/Extrae/Extrae-3.8.3-gompi-2021b.eb
@@ -0,0 +1,55 @@
+# 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.
+"""
+
+toolchain = {'name': 'gompi', 'version': '2021b'}
+toolchainopts = {"usempi": True}
+
+source_urls = ['https://ftp.tools.bsc.es/extrae/']
+sources = ['extrae-%s-src.tar.bz2' % version]
+checksums = ['1495dc9d16eef7f1966228c7301e0cab30a3861fe46d9551770c40ffd758d198']
+
+builddependencies = [
+    ('Autotools', '20210726'),
+]
+
+dependencies = [
+    ('libunwind', '1.5.0'),
+    ('libxml2', '2.9.10'),
+    ('PAPI', '6.0.0.1'),
+    ('Boost', '1.78.0'),
+    ('libdwarf', '20210528'),
+    ('zlib', '1.2.11'),
+    ('CUDA', '11.5', '', 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-gpsmpi-2021b.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..05169b8b20b7aca6ad3142cc54868a8a3c78d25e
--- /dev/null
+++ b/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2021b.eb
@@ -0,0 +1,55 @@
+# 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.
+"""
+
+toolchain = {'name': 'gpsmpi', 'version': '2021b'}
+toolchainopts = {"usempi": True}
+
+source_urls = ['https://ftp.tools.bsc.es/extrae/']
+sources = ['extrae-%s-src.tar.bz2' % version]
+checksums = ['1495dc9d16eef7f1966228c7301e0cab30a3861fe46d9551770c40ffd758d198']
+
+builddependencies = [
+    ('Autotools', '20210726'),
+]
+
+dependencies = [
+    ('libunwind', '1.5.0'),
+    ('libxml2', '2.9.10'),
+    ('PAPI', '6.0.0.1'),
+    ('Boost', '1.78.0'),
+    ('libdwarf', '20210528'),
+    ('zlib', '1.2.11'),
+    ('CUDA', '11.5', '', 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-iompi-2021b.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-iompi-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2cf1dbe2ed3e37210d6dc55d5bea1047f1c5571e
--- /dev/null
+++ b/Golden_Repo/e/Extrae/Extrae-3.8.3-iompi-2021b.eb
@@ -0,0 +1,55 @@
+# 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.
+"""
+
+toolchain = {'name': 'iompi', 'version': '2021b'}
+toolchainopts = {"usempi": True}
+
+source_urls = ['https://ftp.tools.bsc.es/extrae/']
+sources = ['extrae-%s-src.tar.bz2' % version]
+checksums = ['1495dc9d16eef7f1966228c7301e0cab30a3861fe46d9551770c40ffd758d198']
+
+builddependencies = [
+    ('Autotools', '20210726'),
+]
+
+dependencies = [
+    ('libunwind', '1.5.0'),
+    ('libxml2', '2.9.10'),
+    ('PAPI', '6.0.0.1'),
+    ('Boost', '1.78.0'),
+    ('libdwarf', '20210528'),
+    ('zlib', '1.2.11'),
+    ('CUDA', '11.5', '', 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-2021b.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-ipsmpi-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7f9f303a2fcfb270b281fa335563f9e031bc6fb0
--- /dev/null
+++ b/Golden_Repo/e/Extrae/Extrae-3.8.3-ipsmpi-2021b.eb
@@ -0,0 +1,55 @@
+# 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.
+"""
+
+toolchain = {'name': 'ipsmpi', 'version': '2021b'}
+toolchainopts = {"usempi": True}
+
+source_urls = ['https://ftp.tools.bsc.es/extrae/']
+sources = ['extrae-%s-src.tar.bz2' % version]
+checksums = ['1495dc9d16eef7f1966228c7301e0cab30a3861fe46d9551770c40ffd758d198']
+
+builddependencies = [
+    ('Autotools', '20210726'),
+]
+
+dependencies = [
+    ('libunwind', '1.5.0'),
+    ('libxml2', '2.9.10'),
+    ('PAPI', '6.0.0.1'),
+    ('Boost', '1.78.0'),
+    ('libdwarf', '20210528'),
+    ('zlib', '1.2.11'),
+    ('CUDA', '11.5', '', 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'