diff --git a/Golden_Repo/j/Julia.CUDA/Julia.CUDA-1.6.1-gcccoremkl-9.3.0-2020.2.254.eb b/Golden_Repo/j/Julia.CUDA/Julia.CUDA-1.6.1-gcccoremkl-9.3.0-2020.2.254.eb
deleted file mode 100644
index 2a6205cf66cc83c7ab9b0977689bd2be3bf42c03..0000000000000000000000000000000000000000
--- a/Golden_Repo/j/Julia.CUDA/Julia.CUDA-1.6.1-gcccoremkl-9.3.0-2020.2.254.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'JuliaBundle'
-
-name = 'Julia.CUDA'
-version = '1.6.1'
-
-homepage = 'https://juliagpu.gitlab.io/CUDA.jl'
-description = """The CUDA.jl package is the main entrypoint for for programming NVIDIA GPUs using CUDA.
-The package makes it possible to do so at various abstraction levels,
-from easy-to-use arrays down to hand-written kernels using low-level CUDA APIs.
-"""
-
-site_contacts = 'j.goebbert@fz-juelich.de'
-
-toolchain = {'name': 'gcccoremkl', 'version': '9.3.0-2020.2.254'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.34'),
-]
-
-dependencies = [
-    ('Julia', '1.6.1'),
-    ('CUDA', '11.0', '', SYSTEM),
-]
-
-arch_name = 'gpu'
-
-exts_defaultclass = 'JuliaPackage'
-exts_list = [
-    ('CUDA.jl', '3.1.0', {
-        'source_tmpl': 'v3.1.0.tar.gz',
-        'source_urls': ['https://github.com/JuliaGPU/CUDA.jl/archive/']
-    }),
-]
-
-modextravars = {
-    'JULIA_CUDA_USE_BINARYBUILDER': 'false',
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/Julia/Julia-1.6.1-gcccoremkl-9.3.0-2020.2.254.eb b/Golden_Repo/j/Julia/Julia-1.6.1-gcccoremkl-9.3.0-2020.2.254.eb
index 632ff4678adddf65ecd9e6e46bcf551230d9edc9..ca5e6596c13c1938f51127af8c07a5c1a0458b81 100644
--- a/Golden_Repo/j/Julia/Julia-1.6.1-gcccoremkl-9.3.0-2020.2.254.eb
+++ b/Golden_Repo/j/Julia/Julia-1.6.1-gcccoremkl-9.3.0-2020.2.254.eb
@@ -26,6 +26,7 @@ builddependencies = [
 dependencies = [
     ('Python', '3.8.5'),
     ('GMP', '6.2.0'),
+    ('CUDA', '11.0', '', SYSTEM),
     ('SciPy-Stack', '2020', '-Python-%(pyver)s'),
 ]
 
@@ -36,7 +37,7 @@ buildopts = " USE_SYSTEM_GMP=1 USE_INTEL_MKL=1 "
 installopts = "prefix=%(installdir)s "
 
 system_name = local_os.environ['SYSTEMNAME']
-# arch_name = 'gpu'
+arch_name = 'gpu'
 
 exts_defaultclass = 'JuliaPackage'
 exts_list = [
@@ -169,8 +170,17 @@ exts_list = [
         'source_tmpl': 'v0.14.19.tar.gz',
         'source_urls': ['https://github.com/JuliaPlots/StatsPlots.jl/archive/'],
     }),
+    # CUDA
+    ('CUDA.jl', '3.1.0', {
+        'source_tmpl': 'v3.1.0.tar.gz',
+        'source_urls': ['https://github.com/JuliaGPU/CUDA.jl/archive/']
+    }),
 ]
 
+modextravars = {
+    'JULIA_CUDA_USE_BINARYBUILDER': 'false',
+}
+
 sanity_check_paths = {
     'files': ['bin/julia', 'include/julia/julia.h', 'lib/libjulia.so'],
     'dirs': ['bin', 'etc', 'include', 'lib', 'share']
diff --git a/Golden_Repo/j/Julia/Julia-1.6.1-gomkl-2020.eb b/Golden_Repo/j/Julia/Julia-1.6.1-gomkl-2020.eb
index ddf9af13e1a323aafffcc86110289cbc3d5061f9..c36c1831a580a3af420fe0f8d4f92841847da3ee 100644
--- a/Golden_Repo/j/Julia/Julia-1.6.1-gomkl-2020.eb
+++ b/Golden_Repo/j/Julia/Julia-1.6.1-gomkl-2020.eb
@@ -26,6 +26,7 @@ builddependencies = [
 dependencies = [
     ('Python', '3.8.5'),
     ('GMP', '6.2.0'),
+    ('CUDA', '11.0', '', SYSTEM),
     ('SciPy-Stack', '2020', '-Python-%(pyver)s', ('gcccoremkl', '9.3.0-2020.2.254')),
 ]
 
@@ -36,7 +37,7 @@ buildopts = " USE_SYSTEM_GMP=1 USE_INTEL_MKL=1 "
 installopts = "prefix=%(installdir)s "
 
 system_name = local_os.environ['SYSTEMNAME']
-# arch_name = 'gpu'
+arch_name = 'gpu'
 
 exts_defaultclass = 'JuliaPackage'
 exts_list = [
@@ -176,6 +177,11 @@ exts_list = [
         'source_tmpl': 'v0.17.2.tar.gz',
         'source_urls': ['https://github.com/JuliaParallel/MPI.jl/archive/'],
     }),
+    # CUDA
+    ('CUDA.jl', '3.1.0', {
+        'source_tmpl': 'v3.1.0.tar.gz',
+        'source_urls': ['https://github.com/JuliaGPU/CUDA.jl/archive/']
+    }),
 ]
 
 modextravars = {
@@ -184,7 +190,8 @@ modextravars = {
     #  'JULIA_MPIEXEC_ARGS': '',
     'JULIA_MPI_ABI': 'OpenMPI',
     'JULIA_MPI_BINARY': 'system',
-    'JULIA_MPI_PATH': '$::env(EBROOTOPENMPI)'
+    'JULIA_MPI_PATH': '$::env(EBROOTOPENMPI)',
+    'JULIA_CUDA_USE_BINARYBUILDER': 'false',
 }
 
 sanity_check_paths = {