diff --git a/Golden_Repo/b/Boost.Python/Boost.Python-1.77.0-GCC-11.2.0.eb b/Golden_Repo/b/Boost.Python/Boost.Python-1.77.0-GCCcore-11.2.0.eb
similarity index 89%
rename from Golden_Repo/b/Boost.Python/Boost.Python-1.77.0-GCC-11.2.0.eb
rename to Golden_Repo/b/Boost.Python/Boost.Python-1.77.0-GCCcore-11.2.0.eb
index a5e4ed7512304feae280f20d49dea902ccfe4501..ae12c0d73fec68deb7a35a97f65c28880d88937e 100644
--- a/Golden_Repo/b/Boost.Python/Boost.Python-1.77.0-GCC-11.2.0.eb
+++ b/Golden_Repo/b/Boost.Python/Boost.Python-1.77.0-GCCcore-11.2.0.eb
@@ -7,7 +7,7 @@ homepage = 'https://boostorg.github.io/python'
 description = """Boost.Python is a C++ library which enables seamless interoperability between C++
  and the Python programming language."""
 
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
 toolchainopts = {'pic': True}
 
 source_urls = [
@@ -16,6 +16,7 @@ sources = ['boost_%s.tar.gz' % '_'.join(version.split('.'))]
 checksums = ['5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131']
 
 dependencies = [
+    ('binutils', '2.37'),
     ('Boost',  version),
     ('Python', '3.9.6'),
 ]
diff --git a/Golden_Repo/p/PyCUDA/PyCUDA-2021.1-GCCcore-11.2.0.eb b/Golden_Repo/p/PyCUDA/PyCUDA-2021.1-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..87d37183eb2687adcf81467ac8297d053f37c678
--- /dev/null
+++ b/Golden_Repo/p/PyCUDA/PyCUDA-2021.1-GCCcore-11.2.0.eb
@@ -0,0 +1,37 @@
+easyblock = 'PythonBundle'
+
+name = 'PyCUDA'
+version = '2021.1'
+
+homepage = 'https://mathema.tician.de/software/pycuda'
+description = 'PyCUDA lets you access Nvidia’s CUDA parallel computation API from Python.'
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+dependencies = [
+    ('CUDA', '11.5', '', SYSTEM),
+    ('Python', '3.9.6'),
+    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
+    ('Boost.Python', '1.77.0'),
+    ('Mako', '1.1.4'),
+]
+
+local_preinstallopts = './configure.py --cuda-root="$EBROOTCUDA" --boost-inc-dir="$EBROOTBOOST/include/boost" '
+local_preinstallopts += '--boost-lib-dir="$EBROOTBOOST/lib" --no-use-shipped-boost '
+local_preinstallopts += '--boost-python-libname=boost_python39 && '
+
+use_pip = True
+sanity_pip_check = True
+
+exts_list = [
+    ('pytools', '2021.2.9', {
+        'checksums': ['db6cf83c9ba0a165d545029e2301621486d1e9ef295684072e5cd75316a13755'],
+    }),
+    (name, version, {
+        'preinstallopts': './configure.py --cuda-root="$EBROOTCUDA" --boost-inc-dir="$EBROOTBOOST/include/boost" --boost-lib-dir="$EBROOTBOOST/lib" --no-use-shipped-boost --boost-python-libname=boost_python39 && ',
+        'source_tmpl': '%(namelower)s-%(version)s.tar.gz',
+        'checksums': ['ab87312d0fc349d9c17294a087bb9615cffcf966ad7b115f5b051008a48dd6ed'],
+    }),
+]
+
+moduleclass = 'lang'