diff --git a/Golden_Repo/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb
index 0673d21762810ae538f1bcd39c7ebb7a8dbad1d2..ce96cbc899b5c5002f7ced3f779fa8913b425484 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb
@@ -17,6 +17,8 @@ checksums = [
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
     # psmpi-5.5.0-1_ime.patch
     'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+    # psmpi-5.7.0-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
 ]
 
 dependencies = [
@@ -29,7 +31,8 @@ dependencies = [
 
 patches = [
     'psmpi_shebang.patch',
-    'psmpi-5.5.0-1_ime.patch'
+    'psmpi-5.5.0-1_ime.patch',
+    'psmpi-5.7.0-1_singleton-fix.patch'
 ]
 
 mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.7.0-1-NVHPC-23.1.eb b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-NVHPC-23.1.eb
index 531aa376dfb1cc59f09e614d7e23a685451b12fa..0b358cbbee357fc87a9194472a73c277e792679a 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.7.0-1-NVHPC-23.1.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-NVHPC-23.1.eb
@@ -17,6 +17,8 @@ checksums = [
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
     # psmpi-5.5.0-1_ime.patch
     'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+    # psmpi-5.7.0-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
 ]
 
 dependencies = [
@@ -29,7 +31,8 @@ dependencies = [
 
 patches = [
     'psmpi_shebang.patch',
-    'psmpi-5.5.0-1_ime.patch'
+    'psmpi-5.5.0-1_ime.patch',
+    'psmpi-5.7.0-1_singleton-fix.patch'
 ]
 
 mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.7.0-1-intel-compilers-2022.1.0.eb b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-intel-compilers-2022.1.0.eb
index ba1eecdd475c808b2cdbe9d9653e597f2152c405..fec18db29953cc5e4da156897e69f023c4871c5f 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.7.0-1-intel-compilers-2022.1.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.0-1-intel-compilers-2022.1.0.eb
@@ -17,6 +17,8 @@ checksums = [
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
     # psmpi-5.5.0-1_ime.patch
     'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+    # psmpi-5.7.0-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
 ]
 
 dependencies = [
@@ -29,7 +31,8 @@ dependencies = [
 
 patches = [
     'psmpi_shebang.patch',
-    'psmpi-5.5.0-1_ime.patch'
+    'psmpi-5.5.0-1_ime.patch',
+    'psmpi-5.7.0-1_singleton-fix.patch'
 ]
 
 mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.7.0-1_singleton-fix.patch b/Golden_Repo/p/psmpi/psmpi-5.7.0-1_singleton-fix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4643f36c3c5d1c98102c0e4b3bb37b67b8da4c02
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.0-1_singleton-fix.patch
@@ -0,0 +1,40 @@
+From 56ce43874fe1f97b2cc7cbd1a1a0b487432404f4 Mon Sep 17 00:00:00 2001
+From: Carsten Clauss <clauss@par-tec.com>
+Date: Thu, 22 Sep 2022 13:08:18 +0200
+Subject: [PATCH] init: Fix version check for the singleton case.
+
+In the singleton case, there is no need to check the version -- and
+moreover, there is no KVS available (and hence put/get functions for
+it must not be called) since no process manager connected.
+---
+ mpich2/src/mpid/psp/src/mpid_init.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/mpich2/src/mpid/psp/src/mpid_init.c b/mpich2/src/mpid/psp/src/mpid_init.c
+index 5654d5cb9..f31d301b4 100644
+--- a/mpich2/src/mpid/psp/src/mpid_init.c
++++ b/mpich2/src/mpid/psp/src/mpid_init.c
+@@ -245,6 +245,11 @@ static
+ int i_version_set(int pg_rank, const char *ver)
+ {
+ 	int mpi_errno = MPI_SUCCESS;
++
++	/* There is no need to check for version in the singleton case and we moreover must
++	   not use MPIR_pmi_kvs_put() in this case either since there is no process manager. */
++	if (MPIDI_Process.singleton_but_no_pm) goto fn_exit;
++
+ 	if (pg_rank == 0) {
+ 		mpi_errno = MPIR_pmi_kvs_put("i_version", ver);
+ 		MPIR_ERR_CHECK(mpi_errno);
+@@ -262,6 +267,11 @@ static
+ int i_version_check(int pg_rank, const char *ver)
+ {
+         int mpi_errno = MPI_SUCCESS;
++
++	/* There is no need to check for version in the singleton case and we moreover must
++	   not use MPIR_pmi_kvs_get() in this case either since there is no process manager. */
++	if (MPIDI_Process.singleton_but_no_pm) goto fn_exit;
++
+ 	if (pg_rank != 0) {
+ 		char val[100] = "unknown";
+ 		mpi_errno = MPIR_pmi_kvs_get(0, "i_version", val, sizeof(val));
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb
index 8f16abaa8fb8ef6d4ea0f0966c1b9b90bb3b44b1..6e27104e8d854362a4704b07ad4095d36768aff8 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-GCC-11.3.0.eb
@@ -15,6 +15,8 @@ checksums = [
     # psmpi-5.7.0-1.tar.gz
     '0c1c8556afedfb08cd612f379ddb6327ef1bb0867d6f6fed3d610f3d8c790883',
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.7.0-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
 ]
 
 dependencies = [
@@ -28,7 +30,8 @@ dependencies = [
 patches = [
     'psmpi_shebang.patch',
     # We don't have IME in HDFML so we skip this
-    # 'psmpi-5.5.0-1_ime.patch'
+    # 'psmpi-5.5.0-1_ime.patch',
+    'psmpi-5.7.0-1_singleton-fix.patch'
 ]
 
 # We don't have IME in HDFML so we skip this
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-NVHPC-23.1.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-NVHPC-23.1.eb
index b06425298eec656f626de2d1f803aa44adb59902..ecab844fdd8a6aa1896321e8e3f5f963fb5adea8 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-NVHPC-23.1.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-NVHPC-23.1.eb
@@ -15,6 +15,8 @@ checksums = [
     # psmpi-5.7.0-1.tar.gz
     '0c1c8556afedfb08cd612f379ddb6327ef1bb0867d6f6fed3d610f3d8c790883',
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.7.0-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
 ]
 
 dependencies = [
@@ -28,7 +30,8 @@ dependencies = [
 patches = [
     'psmpi_shebang.patch',
     # We don't have IME in HDFML so we skip this
-    # 'psmpi-5.5.0-1_ime.patch'
+    # 'psmpi-5.5.0-1_ime.patch',
+    'psmpi-5.7.0-1_singleton-fix.patch'
 ]
 
 # We don't have IME in HDFML so we skip this
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-intel-compilers-2022.1.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-intel-compilers-2022.1.0.eb
index cf308960ed923a6717e7e7ddbfae4bf0980de7b1..8e3fce51d57e87f6619ab82e1e949cef68cb8f92 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-intel-compilers-2022.1.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.0-1-intel-compilers-2022.1.0.eb
@@ -15,6 +15,8 @@ checksums = [
     # psmpi-5.7.0-1.tar.gz
     '0c1c8556afedfb08cd612f379ddb6327ef1bb0867d6f6fed3d610f3d8c790883',
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.7.0-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
 ]
 
 dependencies = [
@@ -28,7 +30,8 @@ dependencies = [
 patches = [
     'psmpi_shebang.patch',
     # We don't have IME in HDFML so we skip this
-    # 'psmpi-5.5.0-1_ime.patch'
+    # 'psmpi-5.5.0-1_ime.patch',
+    'psmpi-5.7.0-1_singleton-fix.patch'
 ]
 
 # We don't have IME in HDFML so we skip this