diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.0-1-GCC-11.3.0-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.8.0-1-GCC-11.3.0-mt.eb
index 45124f4760edb4f2a22d8b7ac1ac0a6a97226bdc..26e7755501e13165b2bdc67808b6e83bbd3b4ff6 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.8.0-1-GCC-11.3.0-mt.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.0-1-GCC-11.3.0-mt.eb
@@ -1,5 +1,6 @@
 name = 'psmpi'
 version = '5.8.0-1'
+versionsuffix = '-mt'
 
 homepage = 'https://github.com/ParaStation/psmpi2'
 description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.0-1-NVHPC-23.1-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.8.0-1-NVHPC-23.1-mt.eb
index d10dbb64631775c913cfaa4826800a641d45ab70..2884f85de345ca73502170838616e0f6c028e9ae 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.8.0-1-NVHPC-23.1-mt.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.0-1-NVHPC-23.1-mt.eb
@@ -1,5 +1,6 @@
 name = 'psmpi'
 version = '5.8.0-1'
+versionsuffix = '-mt'
 
 homepage = 'https://github.com/ParaStation/psmpi2'
 description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.0-1-intel-compilers-2022.1.0-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.8.0-1-intel-compilers-2022.1.0-mt.eb
index f798f569721e1e89f704f60b65eac905f778e4c8..a3109c024c6ca374b5da2a94a63d45eac5b3191f 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.8.0-1-intel-compilers-2022.1.0-mt.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.0-1-intel-compilers-2022.1.0-mt.eb
@@ -1,5 +1,6 @@
 name = 'psmpi'
 version = '5.8.0-1'
+versionsuffix = '-mt'
 
 homepage = 'https://github.com/ParaStation/psmpi2'
 description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-GCC-11.3.0-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-GCC-11.3.0-mt.eb
index 8e157f7acae1ce83f51e724da65e43ca5bc2ecec..fdacbc91a0099c300e7d2ea9657cfcbc95c24ff6 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-GCC-11.3.0-mt.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-GCC-11.3.0-mt.eb
@@ -1,5 +1,6 @@
 name = 'psmpi'
 version = '5.8.0-1'
+versionsuffix = '-mt'
 
 homepage = 'https://github.com/ParaStation/psmpi2'
 description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-NVHPC-23.1-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-NVHPC-23.1-mt.eb
index da8160f3b55df6b0cce8fda6f6ad11507298c716..47eff2aea862574332228e81e8d2814a91e5f239 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-NVHPC-23.1-mt.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-NVHPC-23.1-mt.eb
@@ -1,5 +1,6 @@
 name = 'psmpi'
 version = '5.8.0-1'
+versionsuffix = '-mt'
 
 homepage = 'https://github.com/ParaStation/psmpi2'
 description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-intel-compilers-2022.1.0-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-intel-compilers-2022.1.0-mt.eb
index 8ffdae0faa6ea7b9418cc97eba58502d6cf9ff19..9a02e867f3d5e1ad469594a3e36251404d35b7d0 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-intel-compilers-2022.1.0-mt.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.0-1-intel-compilers-2022.1.0-mt.eb
@@ -1,5 +1,6 @@
 name = 'psmpi'
 version = '5.8.0-1'
+versionsuffix = '-mt'
 
 homepage = 'https://github.com/ParaStation/psmpi2'
 description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,