diff --git a/Custom_MNS/flexible_custom_hierarchical_mns.py b/Custom_MNS/flexible_custom_hierarchical_mns.py
index 5129c2856e0d4e8ac923bfc60004e7d333f5abb4..6d318f38cdfbe726c05ce8885e949f516f6dc455 100644
--- a/Custom_MNS/flexible_custom_hierarchical_mns.py
+++ b/Custom_MNS/flexible_custom_hierarchical_mns.py
@@ -50,7 +50,7 @@ comp_relevant_versions = {
 # MPI relevant version numbers
 mpi_relevant_versions = {
     'impi': 1,
-    'psmpi': 2,
+    'psmpi': 1,
     'MVAPICH2': 2,
     'OpenMPI': 2,
     'BullMPI': 2,
diff --git a/Golden_Repo/README.md b/Golden_Repo/README.md
index 4f4c6c69932e5d1530aeb095b6dde0babe6a9d09..2353f29f26d54d51be3dd3809a392431198cd585 100644
--- a/Golden_Repo/README.md
+++ b/Golden_Repo/README.md
@@ -18,10 +18,10 @@ The table below shows the details of the toolchains in the 2023 stage:
 
 | Toolchain name  |     Toolchain version     | Underlying GCC |     Compiler     |          MPI            |   CUDA   | Math libraries |  Includes software from   |
 |-----------------|---------------------------|----------------|------------------|-------------------------|----------|----------------|---------------------------|
-| gpsmpi          | 2022a                     | 11.3.0         | GCC 11.3.0       | ParaStationMPI 5.6.X    | 11.7§    |                | GCCcore, GCC              |
+| gpsmpi          | 2022a                     | 11.3.0         | GCC 11.3.0       | ParaStationMPI 5.X      | 11.7§    |                | GCCcore, GCC              |
 | nvompic         | 2022a                     | 11.3.0         | NVHPC TBD        | OpenMPI 4.1.X           | 11.7     |                | GCCcore, NVHPC            |
-| npsmpic         | 2022a                     | 11.3.0         | NVHPC TBD        | ParaStationMPI 5.6.X    | 11.7     |                | GCCcore, NVHPC            |
-| ipsmpi          | 2022a                     | 11.3.0         | Intel 2022.2.0   | ParaStationMPI 5.6.X    | 11.7§    |                | GCCcore, intel-compilers  |
+| npsmpic         | 2022a                     | 11.3.0         | NVHPC TBD        | ParaStationMPI 5.X      | 11.7     |                | GCCcore, NVHPC            |
+| ipsmpi          | 2022a                     | 11.3.0         | Intel 2022.2.0   | ParaStationMPI 5.X      | 11.7§    |                | GCCcore, intel-compilers  |
 | iimpi           | 2022a                     | 11.3.0         | Intel 2022.2.0   | Intel MPI 2021.X.Y      |          |                | GCCcore, intel-compilers  |
 | gompi           | 2022a                     | 11.3.0         | GCC 11.3.0       | OpenMPI 4.1.X           | 11.7§    |                | GCCcore, GCC              |
 | iompi           | 2022a                     | 11.3.0         | Intel 2022.2.0   | OpenMPI 4.1.X           | 11.7§    |                | GCCcore, intel-compilers  |
@@ -31,10 +31,10 @@ The table below shows the details of the toolchains in the 2023 stage:
 | Toolchain name  |     Toolchain version     | Underlying GCC |     Compiler     |          MPI            |   CUDA   | Math libraries |  Includes software from   |
 |-----------------|---------------------------|----------------|------------------|-------------------------|----------|----------------|---------------------------|
 | foss            | 2022a                     | 11.3.0         | GCC 11.3.0       | OpenMPI 4.1.X           | 11.7§    | FlexiBlas (MKL 2022.1.0, BLIS 0.9.0, OpenBLAS 0.3.20) | GCCcore, GCC, gopmpi      |
-| gpsmkl          | 2022a                     | 11.3.0         | GCC 11.3.0       | ParaStationMPI 5.6.X    | 11.7§    | MKL 2022.2.0   | GCCcore, GCC, gpsmpi      |
+| gpsmkl          | 2022a                     | 11.3.0         | GCC 11.3.0       | ParaStationMPI 5.X      | 11.7§    | MKL 2022.2.0   | GCCcore, GCC, gpsmpi      |
 | gomkl           | 2022a                     | 11.3.0         | GCC 11.3.0       | OpenMPI 4.1.X           | 11.7§    | MKL 2022.2.0   | GCCcore, GCC, gompi       |
 | intel           | 2022a                     | 11.3.0         | Intel 2022.2.0   | Intel MPI 2021.X.Y      |          | MKL 2022.2.0   | GCCcore, GCC, iimpi       |
-| intel-para      | 2022a                     | 11.3.0         | Intel 2022.2.0   | ParaStationMPI 5.6.X    |          | MKL 2022.2.0   | GCCcore, GCC, ipsmpi      |
+| intel-para      | 2022a                     | 11.3.0         | Intel 2022.2.0   | ParaStationMPI 5.X      |          | MKL 2022.2.0   | GCCcore, GCC, ipsmpi      |
 | iomkl           | 2022a                     | 11.3.0         | Intel 2022.2.0   | OpenMPI 4.1.X           | 11.7§    | MKL 2022.2.0   | GCCcore, GCC, iompi       |
 
 
diff --git a/Golden_Repo/g/gpsmpi/gpsmpi-2022a.eb b/Golden_Repo/g/gpsmpi/gpsmpi-2022a.eb
index ab322c08273e22a22a3467c2b67e1579155a295d..41208be4cce57a0eda22b45e2f270a29ffccc745 100644
--- a/Golden_Repo/g/gpsmpi/gpsmpi-2022a.eb
+++ b/Golden_Repo/g/gpsmpi/gpsmpi-2022a.eb
@@ -13,7 +13,7 @@ local_compiler = ('GCC', '11.3.0')
 
 dependencies = [
     local_compiler,
-    ('psmpi', '5.6.0-1', '', local_compiler),
+    ('psmpi', '5.7.0-1', '', local_compiler),
 ]
 
 moduleclass = 'toolchain'
diff --git a/Golden_Repo/i/intel-para/intel-para-2022a.eb b/Golden_Repo/i/intel-para/intel-para-2022a.eb
index 2e442a256382ae0833c889068570dd4035253e64..8f74fd6408f645655e79aa701ba06a56fbfe5d59 100644
--- a/Golden_Repo/i/intel-para/intel-para-2022a.eb
+++ b/Golden_Repo/i/intel-para/intel-para-2022a.eb
@@ -18,7 +18,7 @@ local_comp_mpi_tc = ('ipsmpi', version)
 
 dependencies = [
     local_compiler,
-    ('psmpi', '5.6.0-1', '', local_compiler),
+    ('psmpi', '5.7.0-1', '', local_compiler),
     ('imkl', local_comp_ver, '', SYSTEM),
     ('imkl-FFTW', local_comp_ver, '', local_comp_mpi_tc),
 ]
diff --git a/Golden_Repo/i/ipsmpi/ipsmpi-2022a.eb b/Golden_Repo/i/ipsmpi/ipsmpi-2022a.eb
index 61a1d65ff9fe77bc6ed361cf9ba892a20c665717..69a24d0030ea6e0d5e9ad0c84143bbedc1877266 100644
--- a/Golden_Repo/i/ipsmpi/ipsmpi-2022a.eb
+++ b/Golden_Repo/i/ipsmpi/ipsmpi-2022a.eb
@@ -12,7 +12,7 @@ local_comp_ver = '2022.1.0'
 local_compiler = ('intel-compilers', local_comp_ver)
 dependencies = [
     local_compiler,
-    ('psmpi', '5.6.0-1', '', local_compiler),
+    ('psmpi', '5.7.0-1', '', local_compiler),
 ]
 
 moduleclass = 'toolchain'
diff --git a/Golden_Repo/n/npsmpic/npsmpic-2022a.eb b/Golden_Repo/n/npsmpic/npsmpic-2022a.eb
index 2c0a5a4935b5bd34ab22e0d7559e32255f1ae292..b7c3900a29530edc7f1d33078fb1e79babdd5edd 100644
--- a/Golden_Repo/n/npsmpic/npsmpic-2022a.eb
+++ b/Golden_Repo/n/npsmpic/npsmpic-2022a.eb
@@ -13,7 +13,7 @@ local_compiler = ('NVHPC', '22.11')
 dependencies = [
     local_compiler,
     ('CUDA', '11.7', '', SYSTEM),
-    ('psmpi', '5.6.0-1', '', local_compiler),
+    ('psmpi', '5.7.0-1', '', local_compiler),
 ]
 
 moduleclass = 'toolchain'
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.6-CUDA.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5-CUDA.eb
similarity index 98%
rename from Golden_Repo/p/psmpi-settings/psmpi-settings-5.6-CUDA.eb
rename to Golden_Repo/p/psmpi-settings/psmpi-settings-5-CUDA.eb
index ddb203c2252b0b17c1d071d679a9a141b04e143a..f1f0557309f4e69160bcac47c44921b0f323a853 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.6-CUDA.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5-CUDA.eb
@@ -1,7 +1,7 @@
 easyblock = 'SystemBundle'
 
 name = 'psmpi-settings'
-version = '5.6'
+version = '5'
 versionsuffix = 'CUDA'
 
 homepage = ''
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.6-UCX.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5-UCX.eb
similarity index 95%
rename from Golden_Repo/p/psmpi-settings/psmpi-settings-5.6-UCX.eb
rename to Golden_Repo/p/psmpi-settings/psmpi-settings-5-UCX.eb
index 7e82e4a74b46d69084d43c8d59ea474222e92a9f..3f0f135e759d20f791754b5a4bbbeb136772a12d 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.6-UCX.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5-UCX.eb
@@ -1,7 +1,7 @@
 easyblock = 'SystemBundle'
 
 name = 'psmpi-settings'
-version = '5.6'
+version = '5'
 versionsuffix = 'UCX'
 
 homepage = ''
diff --git a/Golden_Repo/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb
similarity index 96%
rename from Golden_Repo/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
rename to Golden_Repo/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb
index 26f4f9221fe486e2b2ab5a6104c4981288fc9e0a..cdebdfeb4b642bc0047e458ed82a12c893f8d004 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb
@@ -1,5 +1,5 @@
 name = 'psmpi'
-version = '5.6.0-1'
+version = '5.7.0-1'
 
 homepage = 'https://github.com/ParaStation/psmpi2'
 description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
@@ -12,7 +12,7 @@ toolchain = {'name': 'GCC', 'version': '11.3.0'}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 checksums = [
-    # psmpi-5.6.0-1.tar.gz
+    # psmpi-5.7.0-1.tar.gz
     'bb532c9cc49da31384bb7d73faccf0be224317bc5b055723095c3965f7ad6209',
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
     # psmpi-5.5.0-1_ime.patch
diff --git a/Golden_Repo/p/psmpi/psmpi-5.6.0-1-NVHPC-22.11.eb b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-NVHPC-22.11.eb
similarity index 96%
rename from Golden_Repo/p/psmpi/psmpi-5.6.0-1-NVHPC-22.11.eb
rename to Golden_Repo/p/psmpi/psmpi-5.7.0-1-NVHPC-22.11.eb
index 07d09cdabbc5b0c39fa76e19570f92b47fc9dfd7..77d9539e7a0eda407ddcac6ff9d325096dddaba9 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.6.0-1-NVHPC-22.11.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-NVHPC-22.11.eb
@@ -1,5 +1,5 @@
 name = 'psmpi'
-version = '5.6.0-1'
+version = '5.7.0-1'
 
 homepage = 'https://github.com/ParaStation/psmpi2'
 description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
@@ -12,7 +12,7 @@ toolchain = {'name': 'NVHPC', 'version': '22.11'}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 checksums = [
-    # psmpi-5.6.0-1.tar.gz
+    # psmpi-5.7.0-1.tar.gz
     'bb532c9cc49da31384bb7d73faccf0be224317bc5b055723095c3965f7ad6209',
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
     # psmpi-5.5.0-1_ime.patch
diff --git a/Golden_Repo/p/psmpi/psmpi-5.6.0-1-intel-compilers-2022.1.0.eb b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-intel-compilers-2022.1.0.eb
similarity index 96%
rename from Golden_Repo/p/psmpi/psmpi-5.6.0-1-intel-compilers-2022.1.0.eb
rename to Golden_Repo/p/psmpi/psmpi-5.7.0-1-intel-compilers-2022.1.0.eb
index 2d420ef264e2d80b766675c60cf1888f180ae98b..740d45ae605c08a953f0e5b05172a32237da9b63 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.6.0-1-intel-compilers-2022.1.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-intel-compilers-2022.1.0.eb
@@ -1,5 +1,5 @@
 name = 'psmpi'
-version = '5.6.0-1'
+version = '5.7.0-1'
 
 homepage = 'https://github.com/ParaStation/psmpi2'
 description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
@@ -12,7 +12,7 @@ toolchain = {'name': 'intel-compilers', 'version': '2022.1.0'}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 checksums = [
-    # psmpi-5.6.0-1.tar.gz
+    # psmpi-5.7.0-1.tar.gz
     'bb532c9cc49da31384bb7d73faccf0be224317bc5b055723095c3965f7ad6209',
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
     # psmpi-5.5.0-1_ime.patch
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb
similarity index 96%
rename from Overlays/hdfml_overlay/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
rename to Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb
index 341924da867f56c87339d3f5d9462d537ff7a063..f740f62264a72e93697e80a09dba63af079d21a2 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb
@@ -1,5 +1,5 @@
 name = 'psmpi'
-version = '5.6.0-1'
+version = '5.7.0-1'
 
 homepage = 'https://github.com/ParaStation/psmpi2'
 description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
@@ -12,7 +12,7 @@ toolchain = {'name': 'GCC', 'version': '11.3.0'}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 checksums = [
-    # psmpi-5.6.0-1.tar.gz
+    # psmpi-5.7.0-1.tar.gz
     'bb532c9cc49da31384bb7d73faccf0be224317bc5b055723095c3965f7ad6209',
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
 ]