diff --git a/Overlays/deep_overlay/p/pscom/pscom-5.7.0-1-GCCcore-11.3.0.eb b/Overlays/deep_overlay/p/pscom/pscom-5.7.0-1-GCCcore-11.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f68da705ed0d3d24a9e77403f735629b76e9adb2
--- /dev/null
+++ b/Overlays/deep_overlay/p/pscom/pscom-5.7.0-1-GCCcore-11.3.0.eb
@@ -0,0 +1,53 @@
+easyblock = "CMakeMake"
+
+name = "pscom"
+# Create drop-in replacement version that ensures overriding behaviour
+version = "5.7.0-1"
+local_realversion = version
+homepage = "http://www.par-tec.com"
+description = f"""ParaStation is a robust and efficient cluster middleware, consisting of a high-performance
+communication layer (MPI) and a sophisticated management layer.
+
+The real version of this package is {local_realversion}
+"""
+
+toolchain = {"name": "GCCcore", "version": "11.3.0"}
+
+source_urls = [
+    "https://gitlab.jsc.fz-juelich.de/deep-sea/wp3/software/%(name)/-/archive/%(local_realversion)/"
+]
+sources = ["%s.tar.gz" % local_realversion]
+checksums = ["5ee1c2cc1438a9c3cfa2e1521ff98860b98a753f574a3acc2eb6186656040fc3"]
+
+builddependencies = [
+    ("binutils", "2.38"),
+    ("popt", "1.18"),
+    ("CUDA", "11.7", "", SYSTEM),
+    ("CMake", "3.23.1"),
+]
+
+dependencies = [
+    ("UCX", "default"),
+]
+
+build_type = "RelWithDebInfo"
+
+preconfigopts = 'export UCP_LDFLAGS="-L$EBROOTUCX/lib" && '
+preconfigopts += 'export CUDA_LDFLAGS="-L$EBROOTNVIDIA/lib64" &&'
+
+configopts = "-DCUDA_ENABLED=ON"
+
+sanity_check_paths = {
+    "files": [
+        "include/%(name)s.h",
+        ("lib/libpscom.so", "lib64/libpscom.so"),
+        ("lib/libpscom4ucp.so", "lib64/libpscom4ucp.so"),
+    ],
+    "dirs": [],
+}
+
+modextravars = {
+    "PSCOMVERSION": "%s" % local_realversion,
+}
+
+moduleclass = "tools"
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-GCC-11.3.0-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-GCC-11.3.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0af659375283d2ff9311424651233161498093be
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-GCC-11.3.0-mt.eb
@@ -0,0 +1,40 @@
+name = "psmpi"
+version = "5.9.2-1"
+versionsuffix = "-pmix-mt"
+
+homepage = "https://github.com/ParaStation/psmpi2"
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v4.1.2. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {"name": "GCC", "version": "11.3.0"}
+
+source_urls = [
+    "https://gitlab.jsc.fz-juelich.de/deep-sea/wp5/software/%(name)/-/archive/%(version)/"
+]
+sources = ["%s.tar.gz" % version]
+checksums = ["a31a3b3c6ade6a61759134157a62e1d491e66e57a2d3282290d2384d4256e8c2"]
+
+builddependencies = [
+    ("Autotools", "20220317"),
+]
+
+dependencies = [
+    ("pscom", "5.7.0-1"),
+    # needed due to the inclusion of hwloc
+    ("libxml2", "2.9.13"),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ("CUDA", "11.7", "", SYSTEM),
+    ("PMIx", "4.2.8"),
+]
+
+mpich_opts = "--enable-static --with-file-system=ufs+gpfs --enable-romio"
+
+configopts = "--with-pmix"
+
+threaded = True
+
+cuda = True
+
+moduleclass = "mpi"
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-GCC-11.3.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-GCC-11.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1a2a7b18e6fb4855427287e2d6c5e2305da426d8
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-GCC-11.3.0.eb
@@ -0,0 +1,40 @@
+name = "psmpi"
+version = "5.9.2-1"
+versionsuffix = "-pmix"
+
+homepage = "https://github.com/ParaStation/psmpi2"
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v4.1.2. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {"name": "GCC", "version": "11.3.0"}
+
+source_urls = [
+    "https://gitlab.jsc.fz-juelich.de/deep-sea/wp5/software/%(name)/-/archive/%(version)/"
+]
+sources = ["%s.tar.gz" % version]
+checksums = ["a31a3b3c6ade6a61759134157a62e1d491e66e57a2d3282290d2384d4256e8c2"]
+
+builddependencies = [
+    ("Autotools", "20220317"),
+]
+
+dependencies = [
+    ("pscom", "5.7.0-1"),
+    # needed due to the inclusion of hwloc
+    ("libxml2", "2.9.13"),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ("CUDA", "11.7", "", SYSTEM),
+    ("PMIx", "4.2.8"),
+]
+
+mpich_opts = "--enable-static --with-file-system=ufs+gpfs --enable-romio"
+
+configopts = "--with-pmix"
+
+threaded = False
+
+cuda = True
+
+moduleclass = "mpi"
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-NVHPC-23.1-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-NVHPC-23.1-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..54628e3ca4571460391d063161c37cc33a16da53
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-NVHPC-23.1-mt.eb
@@ -0,0 +1,40 @@
+name = "psmpi"
+version = "5.9.2-1"
+versionsuffix = "-pmix-mt"
+
+homepage = "https://github.com/ParaStation/psmpi2"
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v4.1.2. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {"name": "NVHPC", "version": "23.1"}
+
+source_urls = [
+    "https://gitlab.jsc.fz-juelich.de/deep-sea/wp5/software/%(name)/-/archive/%(version)/"
+]
+sources = ["%s.tar.gz" % version]
+checksums = ["a31a3b3c6ade6a61759134157a62e1d491e66e57a2d3282290d2384d4256e8c2"]
+
+builddependencies = [
+    ("Autotools", "20220317"),
+]
+
+dependencies = [
+    ("pscom", "5.7.0-1"),
+    # needed due to the inclusion of hwloc
+    ("libxml2", "2.9.13"),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ("CUDA", "11.7", "", SYSTEM),
+    ("PMIx", "4.2.8"),
+]
+
+mpich_opts = "--enable-static --with-file-system=ufs+gpfs --enable-romio"
+
+configopts = "--with-pmix"
+
+threaded = True
+
+cuda = True
+
+moduleclass = "mpi"
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-NVHPC-23.1.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-NVHPC-23.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0d5299cb1f0c6392f2567e1a9e607a692ac9361d
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-NVHPC-23.1.eb
@@ -0,0 +1,41 @@
+name = "psmpi"
+version = "5.9.2-1"
+versionsuffix = "-pmix"
+
+homepage = "https://github.com/ParaStation/psmpi2"
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v4.1.2. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {"name": "NVHPC", "version": "23.1"}
+
+source_urls = [
+    "https://gitlab.jsc.fz-juelich.de/deep-sea/wp5/software/%(name)/-/archive/%(version)/"
+]
+sources = ["%s.tar.gz" % version]
+checksums = ["a31a3b3c6ade6a61759134157a62e1d491e66e57a2d3282290d2384d4256e8c2"]
+
+builddependencies = [
+    ("Autotools", "20220317"),
+]
+
+
+dependencies = [
+    ("pscom", "5.7.0-1"),
+    # needed due to the inclusion of hwloc
+    ("libxml2", "2.9.13"),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ("CUDA", "11.7", "", SYSTEM),
+    ("PMIx", "4.2.8"),
+]
+
+mpich_opts = "--enable-static --with-file-system=ufs+gpfs --enable-romio"
+
+configopts = "--with-pmix"
+
+threaded = False
+
+cuda = True
+
+moduleclass = "mpi"
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-intel-compilers-2022.1.0-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-intel-compilers-2022.1.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..51e8f2c52f550744a55355b5183503f3694474c5
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-intel-compilers-2022.1.0-mt.eb
@@ -0,0 +1,40 @@
+name = "psmpi"
+version = "5.9.2-1"
+versionsuffix = "-pmix-mt"
+
+homepage = "https://github.com/ParaStation/psmpi2"
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v4.1.2. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {"name": "intel-compilers", "version": "2022.1.0"}
+
+source_urls = [
+    "https://gitlab.jsc.fz-juelich.de/deep-sea/wp5/software/%(name)/-/archive/%(version)/"
+]
+sources = ["%s.tar.gz" % version]
+checksums = ["a31a3b3c6ade6a61759134157a62e1d491e66e57a2d3282290d2384d4256e8c2"]
+
+builddependencies = [
+    ("Autotools", "20220317"),
+]
+
+dependencies = [
+    ("pscom", "5.7.0-1"),
+    # needed due to the inclusion of hwloc
+    ("libxml2", "2.9.13"),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ("CUDA", "11.7", "", SYSTEM),
+    ("PMIx", "4.2.8"),
+]
+
+mpich_opts = "--enable-static --with-file-system=ufs+gpfs --enable-romio"
+
+configopts = "--with-pmix"
+
+threaded = True
+
+cuda = True
+
+moduleclass = "mpi"
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-intel-compilers-2022.1.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-intel-compilers-2022.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..80467e3326877f3489b404682057109c47a2fee9
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.9.2-1-intel-compilers-2022.1.0.eb
@@ -0,0 +1,40 @@
+name = "psmpi"
+version = "5.9.2-1"
+versionsuffix = "-pmix"
+
+homepage = "https://github.com/ParaStation/psmpi2"
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v4.1.2. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {"name": "intel-compilers", "version": "2022.1.0"}
+
+source_urls = [
+    "https://gitlab.jsc.fz-juelich.de/deep-sea/wp5/software/%(name)/-/archive/%(version)/"
+]
+sources = ["%s.tar.gz" % version]
+checksums = ["a31a3b3c6ade6a61759134157a62e1d491e66e57a2d3282290d2384d4256e8c2"]
+
+builddependencies = [
+    ("Autotools", "20220317"),
+]
+
+dependencies = [
+    ("pscom", "5.7.0-1"),
+    # needed due to the inclusion of hwloc
+    ("libxml2", "2.9.13"),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ("CUDA", "11.7", "", SYSTEM),
+    ("PMIx", "4.2.8"),
+]
+
+mpich_opts = "--enable-static --with-file-system=ufs+gpfs --enable-romio"
+
+configopts = "--with-pmix"
+
+threaded = False
+
+cuda = True
+
+moduleclass = "mpi"