diff --git a/Golden_Repo/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
index f7f5a4d96a1ed8f688c04cf42d29d1812e656726..482733003700cafd44d9d5cdb76e7e378c7ae4aa 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
@@ -17,7 +17,7 @@ checksums = [
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
     # psmpi-5.5.0-1_ime.patch
     'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
-    # psmpi-5.7.1-1_singleton-fix.patch
+    # psmpi-5.7.0-1_singleton-fix.patch
     '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
 ]
 
@@ -32,7 +32,7 @@ dependencies = [
 patches = [
     'psmpi_shebang.patch',
     'psmpi-5.5.0-1_ime.patch',
-    'psmpi-5.7.1-1_singleton-fix.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.1-1-NVHPC-23.1.eb b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
index cc4d0835a1581ab4729129b12662e61b7703a369..2c07243d7475dd30839c7c0b0aff4286f162b72a 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
@@ -17,7 +17,7 @@ checksums = [
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
     # psmpi-5.5.0-1_ime.patch
     'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
-    # psmpi-5.7.1-1_singleton-fix.patch
+    # psmpi-5.7.0-1_singleton-fix.patch
     '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
 ]
 
@@ -32,7 +32,7 @@ dependencies = [
 patches = [
     'psmpi_shebang.patch',
     'psmpi-5.5.0-1_ime.patch',
-    'psmpi-5.7.1-1_singleton-fix.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.1-1-intel-compilers-2022.1.0.eb b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
index f06d7148111a40e8e0db759b290ce0e375fb9c8d..11f887ac6c593826d7d9968e9b0a8762a8cc01da 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
@@ -17,7 +17,7 @@ checksums = [
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
     # psmpi-5.5.0-1_ime.patch
     'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
-    # psmpi-5.7.1-1_singleton-fix.patch
+    # psmpi-5.7.0-1_singleton-fix.patch
     '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
 ]
 
@@ -32,7 +32,7 @@ dependencies = [
 patches = [
     'psmpi_shebang.patch',
     'psmpi-5.5.0-1_ime.patch',
-    'psmpi-5.7.1-1_singleton-fix.patch'
+    'psmpi-5.7.0-1_singleton-fix.patch'
 ]
 
 mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
index e9109f9a7ffbd5a2de555e51f5f0498763c66068..63bce372abcbbde979f69c7a5356f206780d307b 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
@@ -15,7 +15,7 @@ checksums = [
     # psmpi-5.7.1-1.tar.gz
     'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-    # psmpi-5.7.1-1_singleton-fix.patch
+    # psmpi-5.7.0-1_singleton-fix.patch
     '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
 ]
 
@@ -31,7 +31,7 @@ patches = [
     'psmpi_shebang.patch',
     # We don't have IME in HDFML so we skip this
     # 'psmpi-5.5.0-1_ime.patch',
-    'psmpi-5.7.1-1_singleton-fix.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.1-1-NVHPC-23.1.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
index e9d5c2c1c4b87fd86b1a64c6d9cbcdd3ab2abc7d..cfd22989cb50fbf4ef55a1146813eb8ea29f5ed0 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
@@ -15,7 +15,7 @@ checksums = [
     # psmpi-5.7.1-1.tar.gz
     'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-    # psmpi-5.7.1-1_singleton-fix.patch
+    # psmpi-5.7.0-1_singleton-fix.patch
     '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
 ]
 
@@ -31,7 +31,7 @@ patches = [
     'psmpi_shebang.patch',
     # We don't have IME in HDFML so we skip this
     # 'psmpi-5.5.0-1_ime.patch',
-    'psmpi-5.7.1-1_singleton-fix.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.1-1-intel-compilers-2022.1.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
index ea66d1a7702555519add7e9f6c311e2c0d0fbe0e..d21dcf25e4856af5801ff60ea95a1a79d384fa58 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
@@ -15,7 +15,7 @@ checksums = [
     # psmpi-5.7.1-1.tar.gz
     'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
     '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-    # psmpi-5.7.1-1_singleton-fix.patch
+    # psmpi-5.7.0-1_singleton-fix.patch
     '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
 ]
 
@@ -31,7 +31,7 @@ patches = [
     'psmpi_shebang.patch',
     # We don't have IME in HDFML so we skip this
     # 'psmpi-5.5.0-1_ime.patch',
-    'psmpi-5.7.1-1_singleton-fix.patch'
+    'psmpi-5.7.0-1_singleton-fix.patch'
 ]
 
 # We don't have IME in HDFML so we skip this