diff --git a/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-foss-2022a.eb b/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-foss-2022a.eb
index d435796303cea7959ac8b3213328a4d1109f768d..816bcaaffc5cb6de487b1a1443071f3b7042a4ac 100644
--- a/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-foss-2022a.eb
+++ b/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-foss-2022a.eb
@@ -26,7 +26,7 @@ builddependencies = [
 
 dependencies = [
     ('Python', '3.10.4'),
-    ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')),
     ('zlib', '1.2.12'),
     ('bzip2', '1.0.8'),
     ('Szip', '2.1.1'),
diff --git a/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-gpsmkl-2022a.eb b/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-gpsmkl-2022a.eb
index 0fc2729db8570e1eedcd20fbf1d8529fc5f3ab9d..cfae237b72d033e5a0ca02c85f3eb338cdc3e283 100644
--- a/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-gpsmkl-2022a.eb
+++ b/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-gpsmkl-2022a.eb
@@ -26,7 +26,7 @@ builddependencies = [
 
 dependencies = [
     ('Python', '3.10.4'),
-    ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')),
     ('zlib', '1.2.12'),
     ('bzip2', '1.0.8'),
     ('Szip', '2.1.1'),
diff --git a/Golden_Repo/m/myqlm/myqlm-1.7.3-GCCcore-11.3.0.eb b/Golden_Repo/m/myqlm/myqlm-1.7.3-GCCcore-11.3.0.eb
index 2648d3ec5b00362ce8601916987006fb72b7372a..b4793f582e6a589110997898cf343e1e1f1410b8 100644
--- a/Golden_Repo/m/myqlm/myqlm-1.7.3-GCCcore-11.3.0.eb
+++ b/Golden_Repo/m/myqlm/myqlm-1.7.3-GCCcore-11.3.0.eb
@@ -16,7 +16,7 @@ dependencies = [
     ('networkx', '2.8.4', '', ('gcccoremkl', '11.3.0-2022.1.0')),
     ('tqdm', '4.64.0'),
     ('matplotlib', '3.5.2', '', ('gcccoremkl', '11.3.0-2022.1.0')),
-    ('IPython', '8.5.0'),
+    ('IPython', '8.14.0'),
 ]
 
 exts_default_options = {
diff --git a/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a-EGL.eb b/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a-EGL.eb
index f33303452dcd6034507ed18f1aad7d7cf37c9481..2ed375ca497a918efd06c86045903d96f9d1834f 100644
--- a/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a-EGL.eb
+++ b/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a-EGL.eb
@@ -58,7 +58,8 @@ dependencies = [
     ('double-conversion', '3.2.0'),
     ('Eigen', '3.4.0'),
     ('Qt5', '5.15.5'),
-    ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('matplotlib', '3.5.2', '', ('gcccoremkl', '11.3.0-2022.1.0')),
     ('OpenGL', '2022a'),
     ('Catalyst', '2.0.0-rc3'),
     ('ParaViewData', '5.11.0'),
diff --git a/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a.eb b/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a.eb
index 112eec485d488a0712db30e12a7449ee9b8f9508..fe2372cac92477a690e7dcd1f47137fb52545e63 100644
--- a/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a.eb
+++ b/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a.eb
@@ -57,7 +57,8 @@ dependencies = [
     ('double-conversion', '3.2.0'),
     ('Eigen', '3.4.0'),
     ('Qt5', '5.15.5'),
-    ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('matplotlib', '3.5.2', '', ('gcccoremkl', '11.3.0-2022.1.0')),
     ('OpenGL', '2022a'),
     ('Catalyst', '2.0.0-rc3'),
     ('ParaViewData', '5.11.0'),
diff --git a/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a-EGL.eb b/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a-EGL.eb
index 2c8ae09804766004c5801a79e101961213654721..6c56837996516b1153c1c31fcb9ffb71151c5fd4 100644
--- a/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a-EGL.eb
+++ b/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a-EGL.eb
@@ -58,7 +58,8 @@ dependencies = [
     ('double-conversion', '3.2.0'),
     ('Eigen', '3.4.0'),
     ('Qt5', '5.15.5'),
-    ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('matplotlib', '3.5.2', '', ('gcccoremkl', '11.3.0-2022.1.0')),
     ('OpenGL', '2022a'),
     ('Catalyst', '2.0.0-rc3'),
     ('ParaViewData', '5.11.0'),
diff --git a/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a.eb b/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a.eb
index 91b47e3d139cf6dfea9c2deaf6e71df2b62b8568..89f2cfcb7252526b387287430c9edb39d89425c4 100644
--- a/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a.eb
+++ b/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a.eb
@@ -57,7 +57,8 @@ dependencies = [
     ('double-conversion', '3.2.0'),
     ('Eigen', '3.4.0'),
     ('Qt5', '5.15.5'),
-    ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('matplotlib', '3.5.2', '', ('gcccoremkl', '11.3.0-2022.1.0')),
     ('OpenGL', '2022a'),
     ('Catalyst', '2.0.0-rc3'),
     ('ParaViewData', '5.11.0'),
diff --git a/Golden_Repo/p/PyQuil/PyQuil-3.3.3-gcccoremkl-11.3.0-2022.1.0.eb b/Golden_Repo/p/PyQuil/PyQuil-3.3.3-gcccoremkl-11.3.0-2022.1.0.eb
index 77fb97804fd8fc06ffedab7d617c976782ba7281..e1dabd5fe957dd28672956148c8552147afbe8c2 100644
--- a/Golden_Repo/p/PyQuil/PyQuil-3.3.3-gcccoremkl-11.3.0-2022.1.0.eb
+++ b/Golden_Repo/p/PyQuil/PyQuil-3.3.3-gcccoremkl-11.3.0-2022.1.0.eb
@@ -12,7 +12,7 @@ toolchainopts = {'pic': True}
 dependencies = [
     ('Python', '3.10.4'),
     ('SciPy-bundle', '2022.05'),
-    ('IPython', '8.5.0'),
+    ('IPython', '8.14.0'),
     ('networkx', '2.8.4'),
 
 ]
diff --git a/Golden_Repo/p/PyTorch-Geometric/PyTorch-Geometric-2.1.0-foss-2022a-PyTorch-1.12.1-CUDA-11.7.eb b/Golden_Repo/p/PyTorch-Geometric/PyTorch-Geometric-2.1.0-foss-2022a-PyTorch-1.12.1-CUDA-11.7.eb
index b8e62b72cb44515f5918896c717ae2948aa54e8f..a0288203743b7ded763d805b5d3d0718a71d5521 100644
--- a/Golden_Repo/p/PyTorch-Geometric/PyTorch-Geometric-2.1.0-foss-2022a-PyTorch-1.12.1-CUDA-11.7.eb
+++ b/Golden_Repo/p/PyTorch-Geometric/PyTorch-Geometric-2.1.0-foss-2022a-PyTorch-1.12.1-CUDA-11.7.eb
@@ -1,5 +1,6 @@
 easyblock = 'PythonBundle'
 
+
 name = 'PyTorch-Geometric'
 version = '2.1.0'
 local_pytorchver = '1.12.0'
@@ -14,8 +15,8 @@ dependencies = [
     ('Python', '3.10.4'),
     ('CUDA', '11.7', '', SYSTEM),
     ('PyTorch', local_pytorchver, '-CUDA-%(cudaver)s'),
-    ('scikit-learn', '1.1.2'),
-    ('scikit-image', '0.19.3'),
+    ('scikit-learn', '1.1.2', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('scikit-image', '0.19.3', '', ('gcccoremkl', '11.3.0-2022.1.0')),
     ('numba', '0.56.4', '-CUDA-%(cudaver)s'),
     ('h5py', '3.7.0'),
     ('tqdm', '4.64.0'),
@@ -26,6 +27,11 @@ dependencies = [
 
 use_pip = True
 
+# This easyblock NEED to be installed from a compute node with gpu,
+# see https://github.com/easybuilders/easybuild-easyconfigs/issues/18274
+# This here is needed, but not enough:
+preinstallopts = "FORCE_CUDA=1"
+
 exts_list = [
     ('googledrivedownloader', '0.4', {
         'modulename': 'google_drive_downloader',
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
new file mode 100644
index 0000000000000000000000000000000000000000..482733003700cafd44d9d5cdb76e7e378c7ae4aa
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
@@ -0,0 +1,47 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.1 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.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+    # psmpi-5.7.0-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+patches = [
+    'psmpi_shebang.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'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
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
new file mode 100644
index 0000000000000000000000000000000000000000..2c07243d7475dd30839c7c0b0aff4286f162b72a
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
@@ -0,0 +1,47 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.1 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': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+    # psmpi-5.7.0-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+patches = [
+    'psmpi_shebang.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'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
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
new file mode 100644
index 0000000000000000000000000000000000000000..11f887ac6c593826d7d9968e9b0a8762a8cc01da
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
@@ -0,0 +1,47 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.1 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': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+    # psmpi-5.7.0-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+patches = [
+    'psmpi_shebang.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'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..70f804c55c1bd5fafd5ea06a4d747130a6db624b
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
@@ -0,0 +1,43 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.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.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+patches = [
+    'psmpi-5.5.0-1_ime.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6936bf35ac6d4cc1a915bfe729fdb7295482997f
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
@@ -0,0 +1,42 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.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.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+patches = [
+    'psmpi-5.5.0-1_ime.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d1fa4481085579216ed08125fbbeb0345dcca4dd
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
@@ -0,0 +1,43 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.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': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+patches = [
+    'psmpi-5.5.0-1_ime.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..29e5a42433f303f72dfa7844ea86f1e2aa3777dc
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
@@ -0,0 +1,42 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.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': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+patches = [
+    'psmpi-5.5.0-1_ime.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..41daa4e50081c1b104fb6a50794a4be0e5f5381e
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
@@ -0,0 +1,43 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.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': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+patches = [
+    'psmpi-5.5.0-1_ime.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..74b179c63e94a37e6fbd8a6e3b66e0e4bea15c21
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
@@ -0,0 +1,42 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.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': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+patches = [
+    'psmpi-5.5.0-1_ime.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/s/SciPy-Stack/SciPy-Stack-2022a-gcccoremkl-11.3.0-2022.1.0.eb b/Golden_Repo/s/SciPy-Stack/SciPy-Stack-2022a-gcccoremkl-11.3.0-2022.1.0.eb
index 75e2b199c39e9233a05d8f8b0c6e58b05488623a..a90454d685879b08b33bd8d1ba8bf1e7a25678be 100644
--- a/Golden_Repo/s/SciPy-Stack/SciPy-Stack-2022a-gcccoremkl-11.3.0-2022.1.0.eb
+++ b/Golden_Repo/s/SciPy-Stack/SciPy-Stack-2022a-gcccoremkl-11.3.0-2022.1.0.eb
@@ -5,7 +5,7 @@ version = '2022a'
 homepage = 'http://www.scipy.org'
 description = """SciPy Stack is a collection of open source software for scientific computing in Python.
 SciPy Stack includes SciPy-bundle/2022.05, matplotlib/3.5.2, Seaborn/0.12.1, sympy/1.11.1, xarray/2022.9.0
-and IPython 8.5.0.
+and IPython 8.14.0.
 """
 
 toolchain = {'name': 'gcccoremkl', 'version': '11.3.0-2022.1.0'}
@@ -17,7 +17,7 @@ dependencies = [
     ('Seaborn', '0.12.1'),
     ('sympy', '1.11.1'),
     ('xarray', '2022.9.0'),
-    ('IPython', '8.5.0'),
+    ('IPython', '8.14.0'),
 ]
 
 moduleclass = 'vis'
diff --git a/Golden_Repo/v/VTK/VTK-9.2.5-GCCcore-11.3.0-nompi.eb b/Golden_Repo/v/VTK/VTK-9.2.5-GCCcore-11.3.0-nompi.eb
index 34fbf0ab9bce9e1a0b34dbb44909bc3b98b9fd5c..f86212993ab8a6139492b998a8a823e7f907b85e 100644
--- a/Golden_Repo/v/VTK/VTK-9.2.5-GCCcore-11.3.0-nompi.eb
+++ b/Golden_Repo/v/VTK/VTK-9.2.5-GCCcore-11.3.0-nompi.eb
@@ -33,7 +33,7 @@ builddependencies = [
 dependencies = [
     ('Python', '3.10.4'),
     ('HDF5', '1.12.2', '-serial'),
-    ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')),
     # ('libxc', '5.2.3'),  # not in GCCcore toolchain
     ('netCDF', '4.9.0', '-serial'),
     ('X11', '20220504'),
diff --git a/Golden_Repo/v/VTK/VTK-9.2.5-foss-2022a.eb b/Golden_Repo/v/VTK/VTK-9.2.5-foss-2022a.eb
index 8b48eb2a3b4fcc8815d576df04ed2795271493e8..9336ae0dc69e96a32d6d56f27bd84ffd9c935ce7 100644
--- a/Golden_Repo/v/VTK/VTK-9.2.5-foss-2022a.eb
+++ b/Golden_Repo/v/VTK/VTK-9.2.5-foss-2022a.eb
@@ -32,7 +32,7 @@ builddependencies = [
 dependencies = [
     ('Python', '3.10.4'),
     ('HDF5', '1.12.2',),
-    ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')),
     ('mpi4py', '3.1.4'),
     ('libxc', '5.2.3'),
     ('netCDF', '4.9.0',),
diff --git a/Golden_Repo/v/VTK/VTK-9.2.5-gpsmkl-2022a.eb b/Golden_Repo/v/VTK/VTK-9.2.5-gpsmkl-2022a.eb
index 801c5d4ffe646e49e9acc55eb4533769ec624cf0..32a8a375cac30d799a22665a94faf22395ca030e 100644
--- a/Golden_Repo/v/VTK/VTK-9.2.5-gpsmkl-2022a.eb
+++ b/Golden_Repo/v/VTK/VTK-9.2.5-gpsmkl-2022a.eb
@@ -33,7 +33,7 @@ builddependencies = [
 dependencies = [
     ('Python', '3.10.4'),
     ('HDF5', '1.12.2',),
-    ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')),
     ('mpi4py', '3.1.4'),
     ('libxc', '5.2.3'),
     ('netCDF', '4.9.0',),
diff --git a/Golden_Repo/x/xpra/xpra-4.4.3-GCCcore-11.3.0.eb b/Golden_Repo/x/xpra/xpra-4.4.6-GCCcore-11.3.0.eb
similarity index 66%
rename from Golden_Repo/x/xpra/xpra-4.4.3-GCCcore-11.3.0.eb
rename to Golden_Repo/x/xpra/xpra-4.4.6-GCCcore-11.3.0.eb
index ae77cc49fcc4e15b3eba83e1f4130796d37a2b2b..8faafd7fe008a8c8156c7675cfd22af1b0267b55 100644
--- a/Golden_Repo/x/xpra/xpra-4.4.3-GCCcore-11.3.0.eb
+++ b/Golden_Repo/x/xpra/xpra-4.4.6-GCCcore-11.3.0.eb
@@ -1,7 +1,8 @@
 easyblock = 'Bundle'
 
 name = 'xpra'
-version = '4.4.3'
+version = '4.4.6'
+local_xprahtml5_version = '8.1'
 
 homepage = "http://www.xpra.org"
 description = """Xpra is an open-source multi-platform persistent remote display server and client
@@ -25,7 +26,7 @@ dependencies = [
     ('Python', '3.10.4'),
     ('X11', '20220504'),
     ('OpenGL', '2022a'),
-    ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')),
+    ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')),
     ('PyCairo', '1.23.0'),
     ('PyGObject', '3.42.2'),
     ('Pandoc', '2.19.2', '', SYSTEM),
@@ -50,6 +51,7 @@ dependencies = [
     ('DBus', '1.14.0'),
     ('XServer', '21.1.6'),
     ('CUDA', '11.7', '', SYSTEM),
+    ('PyCUDA', '2022.1'),
 ]
 
 prebuildopts = 'export CFLAGS="-Wno-error=unused-function" && '
@@ -91,6 +93,7 @@ exts_list = [
         'modulename': 'xdg',
         'checksums': ['3267bb3074e934df202af2ee0868575484108581e6f3cb006af1da35395e88b4'],
     }),
+    # kernel module for uinput not loaded on hpc systems
     ('python-uinput', '0.11.2', {
         'modulename': 'uinput',
         'checksums': ['99392b676c77b5795b86b7d75274db33fe754fd1e06fb3d58b167c797dc47f0c'],
@@ -104,20 +107,32 @@ exts_list = [
     ('zeroconf', '0.47.1', {
         'checksums': ['65ab91068f8fafe00856b63756c72296b69682709681e96e8bb5d101345d5011'],
     }),
+    ('Pillow', '9.5.0', {
+        'modulename': 'PIL',
+        'checksums': ['bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1'],
+    }),
+    ('Brotli', '1.0.9', {
+        'modulename': 'brotli',
+        'source_tmpl': '%(name)s-%(version)s.zip',
+        'checksums': ['4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438'],
+    }),
     (name, version, {
         'modulename': False,
-        'buildopts': "--without-strict --with-nvenc --with-enc_x264 --with-enc_x265 --with-Xdummy",
+        'buildopts': (
+            '--without-strict --without-uinput --with-Xdummy '
+            '--with-nvenc --with-nvjpeg_encoder --with-enc_x264 --with-enc_x265 '
+        ),
         'installopts': "--with-tests --without-service",
         'source_tmpl': 'v%(version)s.tar.gz',
         'source_urls': ['https://github.com/Xpra-org/%(name)s/archive/'],
         'patches': ['xpra-4.4.3-use_Xorg_on_PATH_first.patch'],
         'use_pip': False,
         'checksums': [
-            'fc394c5b346791cc941c8917bbdd44bb26be76a021e497fa6f661e62cc4dd57a',
+            '7fec998cf9816df3f0fa5ded01903b07211b0c36a7316c9e9bf6db8b80fb477a',
             'ff1e8984f367ebcc90b56d2c1b87012a7ce53fe4f68686cf042e5bbce16be198',
         ],
     }),
-    ('xpra-html5', '6.1', {
+    ('xpra-html5', local_xprahtml5_version, {
         'modulename': False,
         'skipsteps': [
             'configure',
@@ -127,34 +142,57 @@ exts_list = [
         'source_tmpl': 'v%(version)s.tar.gz',
         'source_urls': ['https://github.com/Xpra-org/%(name)s/archive/'],
         'use_pip': False,
-        'checksums': ['298f85bdd99f075c9d58dcfb904d117283c8034b5f5d24f494d50433ed998ec0'],
+        'patches': [
+            'xprahtml_OffscreenCanvas.patch',
+            'xprahtml_uint8_p255.patch',
+            'xprahtml_timeout.patch',
+            'xprahtml_depcleanup_p257.patch',
+        ],
+        'checksums': [
+            '3b1765aa3aacde03d7e6f53aecb9d96421808bf63b322f74f9ec77a2a8b5b379',
+            '4ebc8ce718daa9bf9f7c7900746b2e484feda9b269505c723d2fc40682802d60',
+            '74f1edc64fbbc151740b10020d18caebf83c890fa27f641d84ca090a9f693739',
+            '86e46d5fb377701e767386b372d7d238c41aa788d560d334596afb662ef897f4',
+            '60f7e77530a3faf640188b5dbf5f1a2d288b8d8ab9af817d74d5faba37081940',
+        ],
     }),
 ]
 
 postinstallcmds = [
+    # link to dirs in installed xpra-egg
     (
-        # installing xpra-html5
-        'pushd %(builddir)s/xprahtml5/xpra-html5-6.1 && '
-        './setup.py install %(installdir)s /share/xpra/www /etc/xpra/html5-client && '
-        'popd'
+        'EGGPATH=%(installdir)s/lib/python%(pyshortver)s/site-packages'
+        '/xpra-%(version)s-py%(pyshortver)s-linux-x86_64.egg/ && '
+        'mkdir -p %(installdir)s/share && '
+        'mv %(installdir)s/share/man %(installdir)s/share/man.bk || true && '
+        'ln -s ${EGGPATH}/share/* %(installdir)s/share/ && '
+        'mkdir -p %(installdir)s/etc/ && '
+        'ln -s ${EGGPATH}/etc/* %(installdir)s/etc/ '
     ),
+    # installing xpra-html5
+    (
+        'pushd %%(builddir)s/xprahtml5/xpra-html5-%s && '
+        './setup.py install %%(installdir)s /share/xpra/www /etc/xpra/html5-client && '
+        'popd && '
+        'pushd %%(installdir)s/share/xpra/www && '
+        'ln -sf ../../../etc/xpra/html5-client/default-settings.txt && '
+        'popd'
+    ) % (local_xprahtml5_version),
     # set specific configurations
     (
-        # set xpra default configs
-        'cp -a %(builddir)s/xpra/xpra-%(version)s/build/etc %(installdir)s && '
-        'cp %(builddir)s/xpra/xpra-%(version)s/fs/etc/xpra/xorg.conf %(installdir)s/etc/xpra/ && '
-        'cp %(builddir)s/xpra/xpra-%(version)s/fs/etc/xpra/xorg-uinput.conf %(installdir)s/etc/xpra/ && '
-        'cp %(builddir)s/xpra/xpra-%(version)s/fs/etc/xpra/cuda.conf %(installdir)s/etc/xpra/ && '
-        'cp %(builddir)s/xpra/xpra-%(version)s/fs/etc/xpra/nvenc.keys %(installdir)s/etc/xpra/ && '
-        'cp %(builddir)s/xpra/xpra-%(version)s/fs/etc/xpra/nvfbc.keys %(installdir)s/etc/xpra/ && '
         # fix the xvfb call
-        "sed -i '/^[[:space:]]*-config \"${XORG_CONFIG_PREFIX}/c\ "
-        "   -config \"%(installdir)s/etc/xpra/xorg.conf\"'"
-        "   %(installdir)s/etc/xpra//conf.d/55_server_x11.conf && "
+        "sed -i '/^[[:space:]]* \"${XORG_CONFIG_PREFIX}/c\ "
+        "   \"%(installdir)s/etc/xpra/xorg.conf\"'"
+        "   %(installdir)s/etc/xpra/conf.d/55_server_x11.conf && "
         # initialize script that can modify the environment of the server
         'touch %(installdir)s/etc/xpra/server.env && '
         "sed -i 's!^source =.*!source = %(installdir)s/etc/xpra/server.env!' "
-        "       %(installdir)s/etc/xpra/conf.d/60_server.conf"
+        "       %(installdir)s/etc/xpra/conf.d/60_server.conf && "
+        # limit socket-dirs to /tmp
+        "sed -i 's/^socket-dirs =/#&/' "
+        "       %(installdir)s/etc/xpra/conf.d/10_network.conf && "
+        "sed -i 's/^#socket-dirs = \/tmp/socket-dirs = \/tmp/' "
+        "       %(installdir)s/etc/xpra/conf.d/10_network.conf "
     ),
     # make Xpra randomly choose a GPU for acceleration if present
     'mv %(installdir)s/bin/xpra %(installdir)s/bin/xpra.orig',
diff --git a/Golden_Repo/x/xpra/xprahtml_OffscreenCanvas.patch b/Golden_Repo/x/xpra/xprahtml_OffscreenCanvas.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f360470026c86cfc6446df2a26dbcbf928a8e6fc
--- /dev/null
+++ b/Golden_Repo/x/xpra/xprahtml_OffscreenCanvas.patch
@@ -0,0 +1,57 @@
+diff -Naur xprahtml5.orig/xpra-html5-8.1/html5/js/OffscreenDecodeWorkerHelper.js xprahtml5/xpra-html5-8.1/html5/js/OffscreenDecodeWorkerHelper.js
+--- xprahtml5.orig/xpra-html5-8.1/html5/js/OffscreenDecodeWorkerHelper.js	2023-07-06 09:03:43.499513815 +0200
++++ xprahtml5/xpra-html5-8.1/html5/js/OffscreenDecodeWorkerHelper.js	2023-07-06 09:01:44.073357671 +0200
+@@ -12,10 +12,40 @@
+  */
+ 
+ const XpraOffscreenWorker = {
++
++  // OffscreenCanvas req. this bugfix https://github.com/WebKit/WebKit/pull/11534
++  isSafariVersionSupported() {
++    var match = navigator.userAgent.match(/version\/(\d+\.\d+)/i);
++    if (match && match[1]) {
++      var version = parseFloat(match[1]);
++      return version >= 999.0;
++    }
++    return false;
++  },
++
++  // OffscreenCanvas supported since v.106
++  // transferToimageBitmap fixed since v.108 (bug-id: 1794956)
++  isFirefoxVersionSupported() {
++    var match = navigator.userAgent.match(/firefox\/(\d+)/i);
++    if (match && match[1]) {
++      var version = parseInt(match[1], 10);
++      return version >= 108;
++    }
++    return false;
++  },
++
+   isAvailable() {
+-    // We do not support firefox as it makes canvases flicker
+-    const isFirefox = navigator.userAgent.toLowerCase().includes("firefox");
+-    if (typeof OffscreenCanvas !== "undefined" && !isFirefox) {
++    var isSafari = navigator.userAgent.toLowerCase().includes("safari");
++    if (isSafari && !this.isSafariVersionSupported()) {
++      return false;
++    }
++
++    var isFirefox = navigator.userAgent.toLowerCase().includes("firefox");
++    if (isFirefox && this.isFirefoxVersionSupported()) {
++      return false;
++    }
++
++    if (typeof OffscreenCanvas !== "undefined") {
+       //we also need the direct constructor:
+       try {
+         new OffscreenCanvas(256, 256);
+@@ -25,7 +55,8 @@
+       }
+     }
+     console.warn(
+-      "Offscreen decoding is not available. Please consider using Google Chrome for better performance."
++      "Offscreen decoding is not available. Please consider using " +
++      "Google Chrome, Firefox >= 108 or Safari >= 16.4 for better performance."
+     );
+     return false;
+   },
diff --git a/Golden_Repo/x/xpra/xprahtml_depcleanup_p257.patch b/Golden_Repo/x/xpra/xprahtml_depcleanup_p257.patch
new file mode 100644
index 0000000000000000000000000000000000000000..310b21dc4f4830f04787ef009684c63cf9a07fba
--- /dev/null
+++ b/Golden_Repo/x/xpra/xprahtml_depcleanup_p257.patch
@@ -0,0 +1,128 @@
+From eaaee8a1a07e07159feaa93e5bf83f0dab706c52 Mon Sep 17 00:00:00 2001
+From: Jens Henrik Goebbert <j.goebbert@fz-juelich.de>
+Date: Thu, 6 Jul 2023 16:43:05 +0200
+Subject: [PATCH 1/3] load Utilities.js in index.html first
+
+In general Utilities.js should be loaded first as it provides functions for others.
+---
+ html5/index.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/html5/index.html b/html5/index.html
+index f58b13f7..ae0e9f1d 100644
+--- a/html5/index.html
++++ b/html5/index.html
+@@ -63,12 +63,12 @@
+     <script type="text/javascript" src="js/lib/jszip.js"></script>
+     <script type="text/javascript" src="js/lib/detect-zoom.js"></script>
+ 
++    <script type="text/javascript" src="js/Utilities.js"></script>
+     <script type="text/javascript" src="js/Keycodes.js"></script>
+     <script type="text/javascript" src="js/Protocol.js"></script>
+     <script type="text/javascript" src="js/Window.js"></script>
+     <script type="text/javascript" src="js/Notifications.js"></script>
+     <script type="text/javascript" src="js/Constants.js"></script>
+-    <script type="text/javascript" src="js/Utilities.js"></script>
+     <script type="text/javascript" src="js/MediaSourceUtil.js"></script>
+     <script type="text/javascript" src="js/RgbHelpers.js"></script>
+     <script type="text/javascript" src="js/VideoDecoder.js"></script>
+
+From 37009b28dbd259d1ddfa2544dbeeab96e70ae765 Mon Sep 17 00:00:00 2001
+From: Jens Henrik Goebbert <j.goebbert@fz-juelich.de>
+Date: Thu, 6 Jul 2023 16:46:36 +0200
+Subject: [PATCH 2/3] add function ord() to Utilities.js
+
+---
+ html5/js/Utilities.js | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/html5/js/Utilities.js b/html5/js/Utilities.js
+index acfa18ba..129ab7e7 100644
+--- a/html5/js/Utilities.js
++++ b/html5/js/Utilities.js
+@@ -55,6 +55,10 @@ const Utilities = {
+     return s.join("");
+   },
+ 
++  ord(c) {
++    return c.charCodeAt(0);
++  },
++
+   getSecureRandomString(length_) {
+     const crypto = window.crypto || window.mscrypto;
+     if (!crypto) {
+
+From 5996e3ef60a861627399e150514bf7b70054495c Mon Sep 17 00:00:00 2001
+From: Jens Henrik Goebbert <j.goebbert@fz-juelich.de>
+Date: Thu, 6 Jul 2023 16:49:56 +0200
+Subject: [PATCH 3/3] use functions from Utilities.js
+
+---
+ html5/js/Protocol.js | 19 ++++++-------------
+ 1 file changed, 6 insertions(+), 13 deletions(-)
+
+diff --git a/html5/js/Protocol.js b/html5/js/Protocol.js
+index ed1ed0ad..67f5de4d 100644
+--- a/html5/js/Protocol.js
++++ b/html5/js/Protocol.js
+@@ -234,14 +234,6 @@ class XpraProtocol {
+     console.log.apply(console, arguments);
+   }
+ 
+-  StringToUint8(string_) {
+-    return Uint8Array.from([...string_].map((x) => x.charCodeAt(0)));
+-  }
+-
+-  ord(c) {
+-    return c.charCodeAt(0);
+-  }
+-
+   do_process_receive_queue() {
+     if (this.header.length < 8 && this.rQ.length > 0) {
+       //add from receive queue data to header until we get the 8 bytes we need:
+@@ -360,7 +352,7 @@ class XpraProtocol {
+ 
+     // decrypt if needed
+     if (proto_crypto) {
+-      this.cipher_in.update(forge.util.createBuffer(Uint8ToString(packet_data)));
++      this.cipher_in.update(forge.util.createBuffer(Utilities.Uint8ToString(packet_data)));
+       const decrypted = this.cipher_in.output.getBytes();
+       if (!decrypted || decrypted.length < packet_size - padding) {
+         this.error("error decrypting packet using", this.cipher_in);
+@@ -376,7 +368,7 @@ class XpraProtocol {
+         this.raw_packets = [];
+         return this.rQ.length > 0;
+       }
+-      packet_data = this.StringToUint8(
++      packet_data = Utilities.StringToUint8(
+         decrypted.slice(0, packet_size - padding)
+       );
+     }
+@@ -472,7 +464,7 @@ class XpraProtocol {
+           this.cipher_out_block_size -
+           (payload_size % this.cipher_out_block_size);
+         let input_data =
+-          typeof bdata === "string" ? bdata : Uint8ToString(bdata);
++          typeof bdata === "string" ? bdata : Utilities.Uint8ToString(bdata);
+         if (padding_size) {
+           const padding_char = String.fromCharCode(padding_size);
+           input_data += padding_char.repeat(padding_size);
+@@ -498,7 +490,7 @@ class XpraProtocol {
+       } else {
+         //copy string one character at a time..
+         for (let index = 0; index < actual_size; index++) {
+-          packet_data[8 + index] = this.ord(bdata[index]);
++          packet_data[8 + index] = Utilities.ord(bdata[index]);
+         }
+       }
+       // put into buffer before send
+@@ -624,7 +616,8 @@ if (
+     "lib/lz4.js",
+     "lib/brotli_decode.js",
+     "lib/forge.js",
+-    "lib/rencode.js"
++    "lib/rencode.js",
++    "Utilities.js"
+   );
+   // make protocol instance
+   const protocol = new XpraProtocol();
diff --git a/Golden_Repo/x/xpra/xprahtml_timeout.patch b/Golden_Repo/x/xpra/xprahtml_timeout.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bffade67cf5807077fa3952efabfdfecec79ef67
--- /dev/null
+++ b/Golden_Repo/x/xpra/xprahtml_timeout.patch
@@ -0,0 +1,31 @@
+diff -Naur xprahtml5.orig/xpra-html5-8.1/html5/js/Client.js xprahtml5/xpra-html5-8.1/html5/js/Client.js
+--- xprahtml5.orig/xpra-html5-8.1/html5/js/Client.js	2023-06-15 19:31:48.000000000 +0200
++++ xprahtml5/xpra-html5-8.1/html5/js/Client.js	2023-07-06 17:21:36.569495387 +0200
+@@ -134,11 +134,11 @@
+     this.reconnect_delay = 1000; //wait 1 second before retrying
+     this.reconnect_attempt = 0;
+     this.swap_keys = Utilities.isMacOS();
+-    this.HELLO_TIMEOUT = 30_000;
+-    this.PING_TIMEOUT = 15_000;
+-    this.PING_GRACE = 2000;
++    this.HELLO_TIMEOUT = 60_000;
++    this.PING_TIMEOUT = 30_000;
++    this.PING_GRACE = 4000;
+     this.PING_FREQUENCY = 5000;
+-    this.INFO_FREQUENCY = 1000;
++    this.INFO_FREQUENCY = 2000;
+     this.uuid = Utilities.getHexUUID();
+     this.offscreen_api = DECODE_WORKER && XpraOffscreenWorker.isAvailable();
+     this.try_gpu = TRY_GPU_TRIGGER;
+diff -Naur xprahtml5.orig/xpra-html5-8.1/html5/js/Protocol.js xprahtml5/xpra-html5-8.1/html5/js/Protocol.js
+--- xprahtml5.orig/xpra-html5-8.1/html5/js/Protocol.js	2023-07-06 17:07:50.029528940 +0200
++++ xprahtml5/xpra-html5-8.1/html5/js/Protocol.js	2023-07-06 17:22:02.235743758 +0200
+@@ -15,7 +15,7 @@
+  *  brotli_decode.js
+  */
+ 
+-const CONNECT_TIMEOUT = 15_000;
++const CONNECT_TIMEOUT = 30_000;
+ 
+ if (!Object.hasOwn) {
+     Object.hasOwn = Object.call.bind(Object.hasOwnProperty);
diff --git a/Golden_Repo/x/xpra/xprahtml_uint8_p255.patch b/Golden_Repo/x/xpra/xprahtml_uint8_p255.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ef551915d763708d8554d19ffbfffa43162230de
--- /dev/null
+++ b/Golden_Repo/x/xpra/xprahtml_uint8_p255.patch
@@ -0,0 +1,68 @@
+From 740724ad355a1b6d30fef6ba3be0a78135ad76c9 Mon Sep 17 00:00:00 2001
+From: Jens Henrik Goebbert <j.goebbert@fz-juelich.de>
+Date: Wed, 5 Jul 2023 19:45:13 +0200
+Subject: [PATCH] fix Protocol.js
+
+- uintToString(..) does not exist. Hence, Uint8ToString(..) from lib/rencode.js imported at line 627 is used
+- Utilities is not in scope so Utilities.StringToUint8(..) fails. Hence, StringToUint8(..) got added to class XpraProtocol
+- Utilities is not in scope so Utilities.Uint8ToString(..) fails. Hence, Uint8ToString(..) from lib/rencode.js imported at line 627 is used
+- ord(..) is not defined. Hence, ord(..) got added to class XpraProtocol
+---
+ html5/js/Protocol.js | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/html5/js/Protocol.js b/html5/js/Protocol.js
+index 3a90d571..ed1ed0ad 100644
+--- a/html5/js/Protocol.js
++++ b/html5/js/Protocol.js
+@@ -234,6 +234,14 @@ class XpraProtocol {
+     console.log.apply(console, arguments);
+   }
+ 
++  StringToUint8(string_) {
++    return Uint8Array.from([...string_].map((x) => x.charCodeAt(0)));
++  }
++
++  ord(c) {
++    return c.charCodeAt(0);
++  }
++
+   do_process_receive_queue() {
+     if (this.header.length < 8 && this.rQ.length > 0) {
+       //add from receive queue data to header until we get the 8 bytes we need:
+@@ -352,7 +360,7 @@ class XpraProtocol {
+ 
+     // decrypt if needed
+     if (proto_crypto) {
+-      this.cipher_in.update(forge.util.createBuffer(uintToString(packet_data)));
++      this.cipher_in.update(forge.util.createBuffer(Uint8ToString(packet_data)));
+       const decrypted = this.cipher_in.output.getBytes();
+       if (!decrypted || decrypted.length < packet_size - padding) {
+         this.error("error decrypting packet using", this.cipher_in);
+@@ -368,7 +376,7 @@ class XpraProtocol {
+         this.raw_packets = [];
+         return this.rQ.length > 0;
+       }
+-      packet_data = Utilities.StringToUint8(
++      packet_data = this.StringToUint8(
+         decrypted.slice(0, packet_size - padding)
+       );
+     }
+@@ -464,7 +472,7 @@ class XpraProtocol {
+           this.cipher_out_block_size -
+           (payload_size % this.cipher_out_block_size);
+         let input_data =
+-          typeof bdata === "string" ? bdata : Utilities.Uint8ToString(bdata);
++          typeof bdata === "string" ? bdata : Uint8ToString(bdata);
+         if (padding_size) {
+           const padding_char = String.fromCharCode(padding_size);
+           input_data += padding_char.repeat(padding_size);
+@@ -490,7 +498,7 @@ class XpraProtocol {
+       } else {
+         //copy string one character at a time..
+         for (let index = 0; index < actual_size; index++) {
+-          packet_data[8 + index] = ord(bdata[index]);
++          packet_data[8 + index] = this.ord(bdata[index]);
+         }
+       }
+       // put into buffer before send
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ee88e31c810cc1832a21e571f2393869cf16637e
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0-mt.eb
@@ -0,0 +1,46 @@
+name = 'psmpi'
+version = '5.7.1-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': 'GCC', 'version': '11.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+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+gpfs --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=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5d26f62e0d0666f635eb02df230419f598014763
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
@@ -0,0 +1,45 @@
+name = 'psmpi'
+version = '5.7.1-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.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+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+gpfs --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=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2b8f13ff0059a4e07b241b903df85476703a21b2
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
@@ -0,0 +1,45 @@
+name = 'psmpi'
+version = '5.7.1-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': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+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+gpfs --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=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8ee4350c73a6f25dcf1dba3766d723402b35f9dd
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
@@ -0,0 +1,45 @@
+name = 'psmpi'
+version = '5.7.1-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': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+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+gpfs --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=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d6061205647d46decad7ddce5350feb5bccbb54b
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
@@ -0,0 +1,34 @@
+name = 'psmpi'
+version = '5.8.1-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': 'GCC', 'version': '11.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ea4f7babdfc2c66a51e626833a5115b729cdb188
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
@@ -0,0 +1,33 @@
+name = 'psmpi'
+version = '5.8.1-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.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..86ead34e6fbcad43db1ad1bcf451387e2251f608
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
@@ -0,0 +1,34 @@
+name = 'psmpi'
+version = '5.8.1-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': 'NVHPC', 'version': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3eb8cb38b8b671de6627af51042915fa37fcf3c7
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
@@ -0,0 +1,33 @@
+name = 'psmpi'
+version = '5.8.1-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': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1dba7676bd6fa2a20ba50deeb0a30b06de3f8d16
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
@@ -0,0 +1,34 @@
+name = 'psmpi'
+version = '5.8.1-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': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9a5fce231f0f2a141f4f9f280ab19887863d3f99
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
@@ -0,0 +1,33 @@
+name = 'psmpi'
+version = '5.8.1-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': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/n/nvidia-driver/nvidia-driver-default.eb b/Overlays/hdfml_overlay/n/nvidia-driver/nvidia-driver-default.eb
index d69923f025b12f3dab83397c88b2a096daaf9f8f..2900da59e4083c0d7fe1a0d7fd1cae2fd1bd0bf2 100644
--- a/Overlays/hdfml_overlay/n/nvidia-driver/nvidia-driver-default.eb
+++ b/Overlays/hdfml_overlay/n/nvidia-driver/nvidia-driver-default.eb
@@ -1,6 +1,6 @@
 name = 'nvidia-driver'
 version = 'default'
-realversion = '525.85.12'
+realversion = '525.105.17'
 
 homepage = 'https://developer.nvidia.com/cuda-toolkit'
 description = f"""
@@ -15,7 +15,7 @@ toolchain = SYSTEM
 
 source_urls = ['http://us.download.nvidia.com/tesla/%s/' % realversion]
 sources = ['NVIDIA-Linux-x86_64-%s.run' % realversion]
-checksums = ['423b1d078e6385182f48c6e201e834b2eea193a622e04d613aa2259fce6e2266']
+checksums = ['c635a21a282c9b53485f19ebb64a0f4b536a968b94d4d97629e0bc547a58142a']
 
 # To avoid conflicts between NVML and the kernel driver
 postinstallcmds = ['rm %(installdir)s/lib64/libnvidia-ml.so*']
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
new file mode 100644
index 0000000000000000000000000000000000000000..63bce372abcbbde979f69c7a5356f206780d307b
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
@@ -0,0 +1,48 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.1 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.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.7.0-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+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.0-1_singleton-fix.patch'
+]
+
+# We don't have IME in HDFML so we skip this
+# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --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=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
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
new file mode 100644
index 0000000000000000000000000000000000000000..cfd22989cb50fbf4ef55a1146813eb8ea29f5ed0
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
@@ -0,0 +1,48 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.1 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': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.7.0-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+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.0-1_singleton-fix.patch'
+]
+
+# We don't have IME in HDFML so we skip this
+# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --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=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
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
new file mode 100644
index 0000000000000000000000000000000000000000..d21dcf25e4856af5801ff60ea95a1a79d384fa58
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
@@ -0,0 +1,48 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.1 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': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.7.0-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+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.0-1_singleton-fix.patch'
+]
+
+# We don't have IME in HDFML so we skip this
+# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --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=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f3bb6e99757bd6168f96602306a9f034e30b9314
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
@@ -0,0 +1,39 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.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.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+# We don't have IME in HDFML so we skip this
+# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --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=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0653692a96665a15d7eac386b0d024da04177853
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
@@ -0,0 +1,38 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.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.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+# We don't have IME in HDFML so we skip this
+# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --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=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..11aeb75054e07d6113e2c525f304e70573d51737
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
@@ -0,0 +1,39 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.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': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+# We don't have IME in HDFML so we skip this
+# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --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=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e82080e74606c0824f32a35387676d50023e2e50
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
@@ -0,0 +1,38 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.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': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+# We don't have IME in HDFML so we skip this
+# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --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=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9a3c8beaef5a698e917ec6922af4af5f9be830fc
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
@@ -0,0 +1,39 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.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': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+# We don't have IME in HDFML so we skip this
+# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --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=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8b1e3ff65e94065f26d5a6d9a3c3660b20a8ac00
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
@@ -0,0 +1,38 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.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': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # 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)
+]
+
+# We don't have IME in HDFML so we skip this
+# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --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=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/acls.yml b/acls.yml
index 0f5e65de9776f46b69e14558101d6b6125cb3813..36b6b04413af2a74365c8a678a49fcf72938335e 100644
--- a/acls.yml
+++ b/acls.yml
@@ -254,7 +254,7 @@ software:
     owner: 'goebbert1'
     base: True
   - name: 'myqlm'
-    owner: 'gonzalezcalaza1'
+    owner: ['gonzalezcalaza1', 'goebbert1']
     base: True
   - name: 'nlohmann-json'
     owner: 'goebbert1'