diff --git a/Golden_Repo/n/npsmpic/npsmpic-2022a.eb b/Golden_Repo/n/npsmpic/npsmpic-2022a.eb
index b7c3900a29530edc7f1d33078fb1e79babdd5edd..863cd7d65002dacac9067cabdf7c07efe737f5d3 100644
--- a/Golden_Repo/n/npsmpic/npsmpic-2022a.eb
+++ b/Golden_Repo/n/npsmpic/npsmpic-2022a.eb
@@ -8,7 +8,7 @@ description = 'NVHPC based compiler toolchain, including Parastation MPICH2 for
 
 toolchain = SYSTEM
 
-local_compiler = ('NVHPC', '22.11')
+local_compiler = ('NVHPC', '23.1')
 
 dependencies = [
     local_compiler,
diff --git a/Golden_Repo/n/nvompic/nvompic-2022a.eb b/Golden_Repo/n/nvompic/nvompic-2022a.eb
index 9ae3a04dafc21b4b8b23412bb2bf0d3fd9fbc2e7..0ce2fff27926b37a98103fa2dbb36fd2bd418217 100644
--- a/Golden_Repo/n/nvompic/nvompic-2022a.eb
+++ b/Golden_Repo/n/nvompic/nvompic-2022a.eb
@@ -8,7 +8,7 @@ description = 'NVHPC based compiler toolchain, including OpenMPI for MPI support
 
 toolchain = SYSTEM
 
-local_compiler = ('NVHPC', '22.11')
+local_compiler = ('NVHPC', '23.1')
 
 dependencies = [
     local_compiler,
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.11.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-NVHPC-23.1.eb
similarity index 97%
rename from Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.11.eb
rename to Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-NVHPC-23.1.eb
index 40ed67dfed508275d69f8b49c83b2c6e551c8709..6bb054ba122071f808ba2a0f0f5f5faf57ed1b9b 100644
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.11.eb
+++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-NVHPC-23.1.eb
@@ -4,7 +4,7 @@ version = '4.1.4'
 homepage = 'https://www.open-mpi.org/'
 description = """The Open MPI Project is an open source MPI-3 implementation."""
 
-toolchain = {'name': 'NVHPC', 'version': '22.11'}
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
 toolchainopts = {'pic': True}
 
 source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
diff --git a/Golden_Repo/p/psmpi/psmpi-5.7.0-1-NVHPC-22.11.eb b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-NVHPC-23.1.eb
similarity index 96%
rename from Golden_Repo/p/psmpi/psmpi-5.7.0-1-NVHPC-22.11.eb
rename to Golden_Repo/p/psmpi/psmpi-5.7.0-1-NVHPC-23.1.eb
index 70c5404b67724cae1ef03be50ff593f2cbcec683..531aa376dfb1cc59f09e614d7e23a685451b12fa 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.7.0-1-NVHPC-22.11.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-NVHPC-23.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': '22.11'}
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.0-1-NVHPC-22.11.eb b/Golden_Repo/p/psmpi/psmpi-5.8.0-1-NVHPC-23.1.eb
similarity index 96%
rename from Golden_Repo/p/psmpi/psmpi-5.8.0-1-NVHPC-22.11.eb
rename to Golden_Repo/p/psmpi/psmpi-5.8.0-1-NVHPC-23.1.eb
index 7b3584281e90504462332b299909a7ee2ebc2c49..80f59623eaef02de8e8f4bece5e79ec5c11f6081 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.8.0-1-NVHPC-22.11.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.0-1-NVHPC-23.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': '22.11'}
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
diff --git a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.11.eb b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-NVHPC-23.1.eb
similarity index 97%
rename from Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.11.eb
rename to Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-NVHPC-23.1.eb
index 348634fadade0b5685c82e83dfa1f8748a0e0d3b..894b648ec0ea3c94c8f2ff461c97be37bedae4d8 100644
--- a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.11.eb
+++ b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-NVHPC-23.1.eb
@@ -4,7 +4,7 @@ version = '4.1.4'
 homepage = 'https://www.open-mpi.org/'
 description = """The Open MPI Project is an open source MPI-3 implementation."""
 
-toolchain = {'name': 'NVHPC', 'version': '22.11'}
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
 toolchainopts = {'pic': True}
 
 source_urls = [
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-NVHPC-22.11.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-NVHPC-23.1.eb
similarity index 96%
rename from Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-NVHPC-22.11.eb
rename to Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-NVHPC-23.1.eb
index 125606353501b4c3bb343cae4665845d849d3dfc..b06425298eec656f626de2d1f803aa44adb59902 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-NVHPC-22.11.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-NVHPC-23.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': '22.11'}
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-NVHPC-22.11.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-NVHPC-23.1.eb
similarity index 96%
rename from Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-NVHPC-22.11.eb
rename to Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-NVHPC-23.1.eb
index 3ad1f7e18ab2003ce0e739013275f9219d200eb1..802ecc42b314a5d3c074c245557e4d58ab08fc15 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-NVHPC-22.11.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-NVHPC-23.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': '22.11'}
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']