diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ab6157539a1af8f24f2b61936c887101fe1c17ef
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
@@ -0,0 +1,56 @@
+name = 'psmpi'
+version = '5.5.0-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'GCC', 'version': '11.2.0'}
+
+sources = [SOURCE_TAR_BZ2]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.5.0-1.tar.bz2
+    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+]
+
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
+]
+dependencies = [
+    ('pscom', '5.4-default', '', SYSTEM),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.10'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.5', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    # We don't have IME in HDFML so we skip this
+    # 'psmpi-5.5.0-1_ime.patch'
+]
+
+# We don't have IME in HDFML so we skip this
+# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
+#
+# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
+# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
+mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
+
+preconfigopts = "./autogen.sh && "
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f273c7a9a5ba808c03c4ef117f2d388bc8caede4
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
@@ -0,0 +1,56 @@
+name = 'psmpi'
+version = '5.5.0-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'NVHPC', 'version': '22.1'}
+
+sources = [SOURCE_TAR_BZ2]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.5.0-1.tar.bz2
+    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+]
+
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
+]
+dependencies = [
+    ('pscom', '5.4-default', '', SYSTEM),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.10'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.5', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    # We don't have IME in HDFML so we skip this
+    # 'psmpi-5.5.0-1_ime.patch'
+]
+
+# We don't have IME in HDFML so we skip this
+# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
+#
+# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
+# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
+mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
+
+preconfigopts = "./autogen.sh && "
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..42b37f8225fcc5f8d12dbd51a6439fba12c7d9a1
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
@@ -0,0 +1,57 @@
+name = 'psmpi'
+version = '5.5.0-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with 
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
+
+sources = [SOURCE_TAR_BZ2]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.5.0-1.tar.bz2
+    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+]
+
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
+]
+dependencies = [
+    ('pscom', '5.4-default', '', SYSTEM),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.10'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.5', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    # We don't have IME in HDFML so we skip this
+    # 'psmpi-5.5.0-1_ime.patch'
+]
+
+# We don't have IME in HDFML so we skip this
+# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
+#
+# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
+# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
+mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
+
+preconfigopts = "./autogen.sh && "
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7503bf3796349efc0ab34de278c6258519165f33
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
@@ -0,0 +1,56 @@
+name = 'psmpi'
+version = '5.5.0-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with 
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
+
+sources = [SOURCE_TAR_BZ2]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.5.0-1.tar.bz2
+    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+]
+
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
+]
+dependencies = [
+    ('pscom', '5.4-default', '', SYSTEM),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.10'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.5', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    # We don't have IME in HDFML so we skip this
+    # 'psmpi-5.5.0-1_ime.patch'
+]
+
+# We don't have IME in HDFML so we skip this
+# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
+#
+# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
+# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
+mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
+
+preconfigopts = "./autogen.sh && "
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'