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
deleted file mode 100644
index ba148247eec462828cdbff968a1e0c898b9a4007..0000000000000000000000000000000000000000
--- a/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2020-CUDA-11.0.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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
index f9878e996ad2e23249616142e65522be52e9d2c0..0acd69b01b66a4b24a05616c3161a65dd5fd5273 100644
--- a/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2020.eb
+++ b/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2020.eb
@@ -40,7 +40,8 @@ dependencies = [
     ('PAPI', '6.0.0'),
     ('Boost', '1.74.0'),
     ('libdwarf', '20201020'),
-    ('zlib', '1.2.11')
+    ('zlib', '1.2.11'),
+    ('CUDA', '11.0', '', SYSTEM)
 ]
 
 preconfigopts = 'autoreconf -vif && '
@@ -49,6 +50,7 @@ preconfigopts = 'autoreconf -vif && '
 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 += '--without-dyninst '
+configopts += '--with-cuda=$EBROOTCUDA --with-cupti=$EBROOTCUDA/extras/CUPTI'
 
 moduleclass = 'perf'