diff --git a/Golden_Repo/n/NVHPC/NVHPC-22.1.eb b/Golden_Repo/n/NVHPC/NVHPC-22.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6fadb5bbde5453c09fecb5d9917e6d1381309771
--- /dev/null
+++ b/Golden_Repo/n/NVHPC/NVHPC-22.1.eb
@@ -0,0 +1,70 @@
+name = 'NVHPC'
+version = '22.1'
+local_gccver = '11.2.0'
+
+homepage = 'https://developer.nvidia.com/hpc-sdk/'
+description = """C, C++ and Fortran compilers included with the NVIDIA HPC SDK (previously: PGI)"""
+
+toolchain = SYSTEM
+
+# By downloading, you accept the HPC SDK Software License Agreement (https://docs.nvidia.com/hpc-sdk/eula/index.html)
+accept_eula = True
+source_urls = ['https://developer.download.nvidia.com/hpc-sdk/%(version)s/']
+local_tarball_tmpl = 'nvhpc_2022_%%(version_major)s%%(version_minor)s_Linux_%s_cuda_multi.tar.gz'
+sources = [local_tarball_tmpl % '%(arch)s']
+checksums = [
+ {
+ local_tarball_tmpl % 'x86_64':
+ '7e4366509ed9031ff271e73327dd3121909902a81ac436307801a5373efaff5e',
+ }
+]
+
+dependencies = [
+ ('GCCcore', local_gccver),
+ ('binutils', '2.37', '', ('GCCcore', local_gccver)),
+ ('CUDA', '11.5', '', SYSTEM),
+ # This is necessary to avoid cases where just libnuma.so.1 is present in the system and -lnuma fails
+ ('numactl', '2.0.14', '', SYSTEM)
+]
+
+module_add_cuda = False
+
+# specify default CUDA version that should be used by NVHPC
+# should match one of the CUDA versions that are included with this NVHPC version
+# (see install_components/Linux_x86_64/20.7/cuda/)
+# for NVHPC 20.7, those are: 11.0, 10.2, 10.1;
+# this version can be tweaked from the EasyBuild command line with
+# --try-amend=default_cuda_version="10.2" (for example)
+default_cuda_version = '11.5'
+
+# NVHPC EasyBlock supports some features, which can be set via CLI or this easyconfig.
+# The following list gives examples for the easyconfig
+#
+# NVHPC needs CUDA to work. Two options are available: 1) Use NVHPC-bundled CUDA, 2) use system CUDA
+# 1) Bundled CUDA
+# If no easybuild dependency to CUDA is present, the bundled CUDA is taken. A version needs to be specified with
+# default_cuda_version = "11.0"
+# in this easyconfig file; alternatively, it can be specified through the command line during installation with
+# --try-amend=default_cuda_version="10.2"
+# 2) CUDA provided via EasyBuild
+# Use CUDAcore as a dependency, for example
+# dependencies = [('CUDAcore', '11.0.2')]
+# The parameter default_cuda_version still can be set as above.
+# If not set, it will be deduced from the CUDA module (via $EBVERSIONCUDA)
+#
+# Define a NVHPC-default Compute Capability
+# cuda_compute_capabilities = "8.0"
+# Can also be specified on the EasyBuild command line via --cuda-compute-capabilities=8.0
+# Only single values supported, not lists of values!
+#
+# Options to add/remove things to/from environment module (defaults shown)
+# module_byo_compilers = False # Remove compilers from PATH (Bring-your-own compilers)
+# module_nvhpc_own_mpi = False # Add NVHPC's own pre-compiled OpenMPI
+# module_add_math_libs = False # Add NVHPC's math libraries (which should be there from CUDA anyway)
+# module_add_profilers = False # Add NVHPC's NVIDIA Profilers
+# module_add_nccl = False # Add NVHPC's NCCL library
+# module_add_nvshmem = False # Add NVHPC's NVSHMEM library
+# module_add_cuda = False # Add NVHPC's bundled CUDA
+
+# this bundle serves as a compiler-only toolchain, so it should be marked as compiler (important for HMNS)
+moduleclass = 'compiler'
diff --git a/Golden_Repo/n/npsmpic/npsmpic-2021b.eb b/Golden_Repo/n/npsmpic/npsmpic-2021b.eb
index 06ca2b93e38c2e543baa579f9d6d055cf51b9c0d..18fb5bcb4ab55b242702f4b329524b72689e3c62 100644
--- a/Golden_Repo/n/npsmpic/npsmpic-2021b.eb
+++ b/Golden_Repo/n/npsmpic/npsmpic-2021b.eb
@@ -8,7 +8,7 @@ description = 'NVHPC based compiler toolchain, including Parastation MPICH2 for
toolchain = SYSTEM
-local_compiler = ('NVHPC', '21.11')
+local_compiler = ('NVHPC', '22.1')
dependencies = [
local_compiler,
diff --git a/Golden_Repo/n/nvompic/nvompic-2021b.eb b/Golden_Repo/n/nvompic/nvompic-2021b.eb
index fe3cf8d4402dd190c7391893dc6c28b00b3b1302..e033d2eea76d71f3794d989c6129e290d34c4b08 100644
--- a/Golden_Repo/n/nvompic/nvompic-2021b.eb
+++ b/Golden_Repo/n/nvompic/nvompic-2021b.eb
@@ -8,7 +8,7 @@ description = 'NVHPC based compiler toolchain, including OpenMPI for MPI support
toolchain = SYSTEM
-local_compiler = ('NVHPC', '21.11')
+local_compiler = ('NVHPC', '22.1')
dependencies = [
local_compiler,
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.11.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.11.eb
deleted file mode 100644
index 4686d9144dead6cc8e78a05eefbdb5b4434b3f8b..0000000000000000000000000000000000000000
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-NVHPC-21.11.eb
+++ /dev/null
@@ -1,61 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.1'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'NVHPC', 'version': '21.11'}
-toolchainopts = {'pic': True}
-
-source_urls = [
- 'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda']
-
-osdependencies = [
- # needed for --with-verbs
- ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
- # needed for --with-pmix
- ('pmix-devel'),
-]
-
-builddependencies = [
- ('Autotools', '20210726', '', SYSTEM),
- ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
- ('zlib', '1.2.11'),
- ('hwloc', '2.5.0'),
- ('UCX', '1.11.2', '', SYSTEM),
- ('CUDA', '11.5', '', SYSTEM),
- ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--with-ime=/opt/ddn/ime '
-configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
- 'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
- ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
- ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
- "mpif", "mpi", "mpi_portable_platform"]],
- 'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-NVHPC-21.11.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
similarity index 97%
rename from Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-NVHPC-21.11.eb
rename to Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
index b1b507116ddcc446ee41b9af389f81f64f1811bf..c0a192ba3a73ed417e3a85043485a65fc0f8c3fb 100644
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-NVHPC-21.11.eb
+++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
@@ -6,7 +6,7 @@ version = '4.1.2'
homepage = 'https://www.open-mpi.org/'
description = """The Open MPI Project is an open source MPI-3 implementation."""
-toolchain = {'name': 'NVHPC', 'version': '21.11'}
+toolchain = {'name': 'NVHPC', 'version': '22.1'}
toolchainopts = {'pic': True}
source_urls = [
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-21.11.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
similarity index 97%
rename from Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-21.11.eb
rename to Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
index 258652e44d4847963d755eb31034aa06a90267d7..ed6ac2d073c5b4bcd8ca4c900f2e3863ff5f4c5d 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-21.11.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
@@ -7,7 +7,7 @@ based on MPICH v3. It provides extra low level communication libraries and integ
various batch systems for tighter process control.
"""
-toolchain = {'name': 'NVHPC', 'version': '21.11'}
+toolchain = {'name': 'NVHPC', 'version': '22.1'}
sources = [SOURCE_TAR_BZ2]
source_urls = ['https://github.com/ParaStation/psmpi/archive/']