diff --git a/Golden_Repo/c/CUDA/CUDA-11.4.eb b/Golden_Repo/c/CUDA/CUDA-11.5.eb
similarity index 84%
rename from Golden_Repo/c/CUDA/CUDA-11.4.eb
rename to Golden_Repo/c/CUDA/CUDA-11.5.eb
index de2c0f054b953a874bbfffc150a6a648f1ee72d9..93a709d92c169df3c7bde81dcac9e7942d1fcc6a 100644
--- a/Golden_Repo/c/CUDA/CUDA-11.4.eb
+++ b/Golden_Repo/c/CUDA/CUDA-11.5.eb
@@ -1,6 +1,6 @@
 name = 'CUDA'
-version = '11.4'
-local_complete_version = '%(version)s.1'
+version = '11.5'
+local_complete_version = '%(version)s.0'
 
 homepage = 'https://developer.nvidia.com/cuda-toolkit'
 description = """CUDA (formerly Compute Unified Device Architecture) is a parallel
@@ -21,9 +21,9 @@ source_urls = [
     'https://developer.nvidia.com/compute/cuda/%(version_major_minor)s/Prod2/local_installers/',
 ]
 sources = [
-    '%%(namelower)s_%s_470.57.02_linux.run' % local_complete_version,
+    '%%(namelower)s_%s_495.29.05_linux.run' % local_complete_version,
 ]
-checksums = ['dd6c339a719989d2518f5d54eeac1ed707d0673f8664ba0c4d4b2af7c3ba0005']
+checksums = ['ae0a1693d9497cf3d81e6948943e3794636900db71c98d58eefdacaf7f1a1e4c']
 
 dependencies = [
     ('nvidia-driver', 'default', '', SYSTEM),
diff --git a/Golden_Repo/j/Java/Java-15.0.1.eb b/Golden_Repo/j/Java/Java-15.0.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bb6dfec423322abe80dc4ee969b26720f39fdfb2
--- /dev/null
+++ b/Golden_Repo/j/Java/Java-15.0.1.eb
@@ -0,0 +1,15 @@
+name = 'Java'
+version = '15.0.1'
+
+homepage = 'http://openjdk.java.net'
+description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
+ Java applications on desktops and servers."""
+
+toolchain = SYSTEM
+
+source_urls = [
+    'https://download.java.net/java/GA/jdk%(version)s/51f4f36ad4ef43e39d0dfdbaf6549e32/9/GPL/']
+sources = ['openjdk-%(version)s_linux-x64_bin.tar.gz']
+checksums = ['83ec3a7b1649a6b31e021cde1e58ab447b07fb8173489f27f427e731c89ed84a']
+
+moduleclass = 'lang'
diff --git a/Golden_Repo/j/Java/Java-15.eb b/Golden_Repo/j/Java/Java-15.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bb6dfec423322abe80dc4ee969b26720f39fdfb2
--- /dev/null
+++ b/Golden_Repo/j/Java/Java-15.eb
@@ -0,0 +1,15 @@
+name = 'Java'
+version = '15.0.1'
+
+homepage = 'http://openjdk.java.net'
+description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
+ Java applications on desktops and servers."""
+
+toolchain = SYSTEM
+
+source_urls = [
+    'https://download.java.net/java/GA/jdk%(version)s/51f4f36ad4ef43e39d0dfdbaf6549e32/9/GPL/']
+sources = ['openjdk-%(version)s_linux-x64_bin.tar.gz']
+checksums = ['83ec3a7b1649a6b31e021cde1e58ab447b07fb8173489f27f427e731c89ed84a']
+
+moduleclass = 'lang'
diff --git a/bin/gcc10ize.py b/bin/gcc11ize.py
similarity index 85%
rename from bin/gcc10ize.py
rename to bin/gcc11ize.py
index f67f66effdf8eb4046b41d7c84155e373b7e0612..e51b52587daee3897e8a973a6fb540a6c57e5225 100755
--- a/bin/gcc10ize.py
+++ b/bin/gcc11ize.py
@@ -7,36 +7,38 @@ For it, you need
 """
 
 import argparse
-oldGCC = '9.3.0'
-newGCC = '10.3.0'
-oldMKL = '2020.2.254'
-newMKL = '2021.2.0'
-oldgomkl = '2020'
-newgomkl = '2021'
-oldgpsmpi = '2020'
-newgpsmpi = '2021'
-oldBinutils = '2.34'
-newBinutils = '2.36.1'
-oldBison = '3.6.4'
+oldGCC = '10.3.0'
+newGCC = '11.2.0'
+oldMKL = '2021.2.0'
+newMKL = '2021.4.0'
+oldgomkl = '2021'
+newgomkl = '2022'
+oldgpsmpi = '2021'
+newgpsmpi = '2022'
+oldBinutils = '2.36.1'
+newBinutils = '2.37'
+oldBison = '3.7.6'
 newBison = '3.7.6'
-oldLibDRM = '2.4.99'
-newLibDRM = '2.4.106'
-oldJava = '1.8'
+oldLibDRM = '2.4.106'
+newLibDRM = '2.4.107'
+oldJava = '15'
 newJava = '15'
 oldCMake = "('CMake', '3.18.0')"
-newCMake = "('CMake', '3.18.0', '', SYSTEM)"
-oldCUDA = '11.0'
-newCUDA = '11.3'
-oldcuDNN = '8.0.2.39'
-newcuDNN = '8.2.1.32'
-oldScikit = '2020'
-newScikit = '2021'
-oldSciPy = '2020'
-newSciPy = '2021'
-oldprotobuf = '3.13.0'
-newprotobuf = '3.14.0'
-oldLibxc = '4.3.4'
-newLibxc = '5.1.5'
+newCMake = "('CMake', '3.21.1', '', SYSTEM)"
+oldCUDA = '11.3'
+newCUDA = '11.5'
+oldcuDNN = '8.2.1.32'
+newcuDNN = '8.2.2.26'
+oldScikit = '2021'
+newScikit = '2022'
+oldSciPy = '2021'
+newSciPy = '2022'
+oldprotobuf = '3.14.0'
+newprotobuf = '3.17.3'
+oldLibxc = '5.1.5'
+newLibxc = '5.1.6'
+oldPython = '3.8.5'
+newPython = '3.9.6'
 
 
 def parse_arguments():
@@ -120,6 +122,9 @@ def updateFile(oldName, newName, current, latest, siteContact):
                 if "libxc" in line:
                     print("Fixing libxc")
                     line = line.replace(oldLibxc, newLibxc)
+                if "Python" in line:
+                    print("Fixing Python")
+                    line = line.replace(oldPython, newPython)
                 newFile.write(line)
         newFile.close()
         return True