diff --git a/Golden_Repo/README.md b/Golden_Repo/README.md
index 5034c7173c608a9de7e46b86a2bb060ac6683e37..99198f1e06daea856e9acb36579dffd070458c62 100644
--- a/Golden_Repo/README.md
+++ b/Golden_Repo/README.md
@@ -11,30 +11,30 @@ The table below shows the details of the toolchains in the 2022 stage:
| Toolchain name | Toolchain version | Underlying GCC | Compiler | MPI | CUDA | Math libraries | Includes software from |
|-----------------|---------------------------|----------------|------------------|-------------------------|----------|----------------|---------------------------|
| GCC | 11.2.0 | 11.2.0 | GCC 11.2.0 | | | | GCCcore |
-| NVHPC | TBD-GCC-11.2.0 | 11.2.0 | NVHPC TBD | | TBD§ | | GCCcore |
-| intel-compilers | TBD-GCC-11.2.0 | 11.2.0 | Intel TBD | | | | GCCcore |
+| NVHPC | TBD-GCC-11.2.0 | 11.2.0 | NVHPC TBD | | 11.5§ | | GCCcore |
+| intel-compilers | 2021.4.0 | 11.2.0 | Intel 2021.4.0 | | | | GCCcore |
- Compilers+MPI
| Toolchain name | Toolchain version | Underlying GCC | Compiler | MPI | CUDA | Math libraries | Includes software from |
|-----------------|---------------------------|----------------|------------------|-------------------------|----------|----------------|---------------------------|
-| gpsmpi | 2021b | 11.2.0 | GCC 11.2.0 | ParaStationMPI 5.4.X | TBD§ | | GCCcore, GCC |
-| nvompic | 2021b | 11.2.0 | NVHPC TBD | OpenMPI TBD | TBD | | GCCcore, NVHPC |
-| npsmpic | 2021b | 11.2.0 | NVHPC TBD | ParaStationMPI 5.4.X | TBD | | GCCcore, NVHPC |
-| ipsmpi | 2021b | 11.2.0 | Intel TBD | ParaStationMPI 5.4.X | TBD§ | | GCCcore, intel-compilers |
-| iimpi | 2021b | 11.2.0 | Intel TBD | Intel MPI TBD | | | GCCcore, intel-compilers |
-| gompi | 2021b | 11.2.0 | GCC 11.2.0 | OpenMPI TBD | TBD§ | | GCCcore, GCC |
-| iompi | 2021b | 11.2.0 | Intel TBD | OpenMPI TBD | TBD§ | | GCCcore, intel-compilers |
+| gpsmpi | 2021b | 11.2.0 | GCC 11.2.0 | ParaStationMPI 5.5.X | 11.5§ | | GCCcore, GCC |
+| nvompic | 2021b | 11.2.0 | NVHPC TBD | OpenMPI 4.1.X | 11.5 | | GCCcore, NVHPC |
+| npsmpic | 2021b | 11.2.0 | NVHPC TBD | ParaStationMPI 5.5.X | 11.5 | | GCCcore, NVHPC |
+| ipsmpi | 2021b | 11.2.0 | Intel 2021.4.0 | ParaStationMPI 5.5.X | 11.5§ | | GCCcore, intel-compilers |
+| iimpi | 2021b | 11.2.0 | Intel 2021.4.0 | Intel MPI 2021.X.Y | | | GCCcore, intel-compilers |
+| gompi | 2021b | 11.2.0 | GCC 11.2.0 | OpenMPI 4.1.X | 11.5§ | | GCCcore, GCC |
+| iompi | 2021b | 11.2.0 | Intel 2021.4.0 | OpenMPI 4.1.X | 11.5§ | | GCCcore, intel-compilers |
- Compilers+MPI+Math
| Toolchain name | Toolchain version | Underlying GCC | Compiler | MPI | CUDA | Math libraries | Includes software from |
|-----------------|---------------------------|----------------|------------------|-------------------------|----------|----------------|---------------------------|
-| gpsmkl | 2021b | 11.2.0 | GCC 11.2.0 | ParaStationMPI 5.4.X | TBD§ | MKL TBD | GCCcore, GCC, gpsmpi |
-| gomkl | 2021b | 11.2.0 | GCC 11.2.0 | OpenMPI TBD | TBD§ | MKL TBD | GCCcore, GCC, gompi |
-| intel | 2021b | 11.2.0 | Intel TBD | Intel MPI TBD | | MKL TBD | GCCcore, GCC, iimpi |
-| intel-para | 2021b | 11.2.0 | Intel TBD | ParaStationMPI 5.4.X | | MKL TBD | GCCcore, GCC, ipsmpi |
-| iomkl | 2021b | 11.2.0 | Intel TBD | OpenMPI TBD | TBD§ | MKL TBD | GCCcore, GCC, iompi |
+| gpsmkl | 2021b | 11.2.0 | GCC 11.2.0 | ParaStationMPI 5.5.X | 11.5§ | MKL 2021.4.0 | GCCcore, GCC, gpsmpi |
+| gomkl | 2021b | 11.2.0 | GCC 11.2.0 | OpenMPI 4.1.X | 11.5§ | MKL 2021.4.0 | GCCcore, GCC, gompi |
+| intel | 2021b | 11.2.0 | Intel 2021.4.0 | Intel MPI 2021.X.Y | | MKL 2021.4.0 | GCCcore, GCC, iimpi |
+| intel-para | 2021b | 11.2.0 | Intel 2021.4.0 | ParaStationMPI 5.5.X | | MKL 2021.4.0 | GCCcore, GCC, ipsmpi |
+| iomkl | 2021b | 11.2.0 | Intel 2021.4.0 | OpenMPI 4.1.X | 11.5§ | MKL 2021.4.0 | GCCcore, GCC, iompi |
§ Not included in the toolchain just as dependency
diff --git a/Golden_Repo/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb b/Golden_Repo/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
index 960fd491bb3fa14f4298f6aad3b6520b06385a22..942f539397793a2a7e26c1d944686d657de1b810 100644
--- a/Golden_Repo/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
+++ b/Golden_Repo/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
@@ -35,7 +35,7 @@ dependencies = [
('numactl', '2.0.14', '', SYSTEM),
('libxml2', '2.9.10'),
('libpciaccess', '0.16'),
- ('CUDA', '11.4', '', SYSTEM),
+ ('CUDA', '11.5', '', SYSTEM),
]
configopts = "--enable-libnuma=$EBROOTNUMACTL --enable-cuda --enable-nvml --enable-opencl "
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
index cf5bd68fa1b49d386f0d76f2c7eb9e783f63a403..3df9c781577f7ae832c7a5c67766fd15312e878c 100644
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
+++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
@@ -32,7 +32,7 @@ dependencies = [
('zlib', '1.2.11'),
('hwloc', '2.5.0'),
('UCX', '1.11.2', '', SYSTEM),
- ('CUDA', '11.4', '', SYSTEM),
+ ('CUDA', '11.5', '', SYSTEM),
('libevent', '2.1.12'),
]
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
index 6d4a8f88a997f93f22fb0352e9ed5a7617858e21..8792860bb3bc2ab8d36b940d3d503b0f75f9e47b 100644
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
+++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
@@ -30,7 +30,7 @@ dependencies = [
('zlib', '1.2.11'),
('hwloc', '2.5.0'),
('UCX', '1.11.2', '', SYSTEM),
- ('CUDA', '11.4', '', SYSTEM),
+ ('CUDA', '11.5', '', SYSTEM),
('libevent', '2.1.12'),
]
diff --git a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
index 43848326d0cb64c3152985b947167d9c3b964974..f78a9374c6e3cc5ab42097975ccd9bbbad5ec956 100644
--- a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
+++ b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
@@ -32,7 +32,7 @@ dependencies = [
('zlib', '1.2.11'),
('hwloc', '2.5.0'),
('UCX', '1.11.2', '', SYSTEM),
- ('CUDA', '11.4', '', SYSTEM),
+ ('CUDA', '11.5', '', SYSTEM),
('libevent', '2.1.12'),
]
diff --git a/Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb b/Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb
index f3059aaff422f0dbcca38d9f784e3f50d78c8f2d..3b86e20835936b13b5b57e5f8aab80be4007302c 100644
--- a/Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb
+++ b/Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb
@@ -28,7 +28,7 @@ dependencies = [
('zlib', '1.2.11'),
('hwloc', '2.5.0'),
('UCX', '1.11.2', '', SYSTEM),
- ('CUDA', '11.4', '', SYSTEM),
+ ('CUDA', '11.5', '', SYSTEM),
('libevent', '2.1.12'),
]