diff --git a/Batchsystem/slurm/build b/Batchsystem/slurm/build
index 3800ffa..118fcd0 100755
--- a/Batchsystem/slurm/build
+++ b/Batchsystem/slurm/build
@@ -1,14 +1,9 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "https://download.schedmd.com/${P}/${P}-${V}.tar.bz2"
-
-pbuild::add_to_group 'Batchsystem'
-pbuild::install_docfiles 'AUTHORS' 'INSTALL' 'NEWS' 'README.rst' 'RELEASE_NOTES'
-
 pbuild::pre_configure() {
-	pbuild::add_configure_args "--with-pmix=${PMIX_PREFIX}"
+	# pbuild::add_configure_args "--with-pmix=${PMIX_PREFIX}"
 	pbuild::add_configure_args "--with-nvml=${CUDA_PREFIX}"
 	pbuild::add_configure_args "--with-hwloc=${HWLOC_PREFIX}"
-	pbuild::add_configure_args "--with-ucx=${UCX_PREFIX}"
+	# pbuild::add_configure_args "--with-ucx=${UCX_PREFIX}"
 	# pbuild::add_configure_args "--with-netloc=${HWLOC_PREFIX}"
 }
diff --git a/Batchsystem/slurm/files/config.yaml b/Batchsystem/slurm/files/config.yaml
new file mode 100644
index 0000000..9de30f2
--- /dev/null
+++ b/Batchsystem/slurm/files/config.yaml
@@ -0,0 +1,27 @@
+---
+# yamllint disable rule:line-length
+format: 1
+slurm:
+  defaults:
+    group: Batchsystem
+    overlay: Alps
+    relstage: stable
+    docfiles: [AUTHORS, INSTALL, NEWS, README.rst RELEASE_NOTES]
+    urls:
+      - url: https://download.schedmd.com/${P}/${P}-${V}.tar.bz2
+  shasums:
+    slurm-24.05.3.tar.bz2: b0b40513e9b6ae867ddb95d60b950bcb980c15b735b5d0dea37a9a00cc64ae24
+
+  versions:
+    24.05.3:
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          relstage: unstable
+          overlay: Alps
+          use_overlays: [PSI]
+          group_deps:
+            compiler: {gcc: [12.3.0]}
+          build_requires: [cuda/12.2.0, hwloc/2.11.1, patchelf/0.14.5]
+          configure_args+:
+            - '--with-pmix=/opt/psi/overlays/Alps/Libraries/pmix/2.2.5:/opt/psi/overlays/Alps/Libraries/pmix/3.2.5:/opt/psi/overlays/Alps/Libraries/pmix/4.2.9:/opt/psi/overlays/Alps/Libraries/pmix/5.0.3'
+            - '--with-cray_shasta'
diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build
index 31bf3b5..d9bd927 100755
--- a/Compiler/openmpi/build
+++ b/Compiler/openmpi/build
@@ -1,41 +1,73 @@
 #!/usr/bin/env modbuild
 
-pbuild::install_docfiles 'AUTHORS' 'LICENSE' 'NEWS' 'README'
-
 pbuild::pre_configure() {
-	pbuild::add_configure_args "--prefix=${PREFIX}"
-	pbuild::add_configure_args "--enable-mpi-cxx"
-	pbuild::add_configure_args "--enable-mpi-cxx-seek"
-	pbuild::add_configure_args "--enable-orterun-prefix-by-default"
-	pbuild::add_configure_args "--enable-shared"
-	pbuild::add_configure_args "--enable-static"
-	pbuild::add_configure_args "--with-slurm=yes"
+        pbuild::add_configure_args "--enable-shared"
+        pbuild::add_configure_args "--enable-static"
 
-	if [[ -v CUDA_VERSION ]]; then	
+        if (( V_MAJOR < 5 )); then
+		pbuild::add_configure_args "--enable-mpi-cxx"
+		pbuild::add_configure_args "--enable-mpi-cxx-seek"
+		pbuild::add_configure_args "--enable-orterun-prefix-by-default"
+        fi
+	if (( V_MAJOR < 5 )) && pbuild::use_flag 'slurm'; then
+		pbuild::add_configure_args "--with-pmi=/usr"
+		pbuild::add_configure_args "--with-pmi-libdir=/usr/lib64/slurmpmi"
+	fi
+	if (( V_MAJOR < 5 )) && pbuild::use_flag 'ra'; then
+		pbuild::add_configure_args "--with-pmi=/usr"
+		pbuild::add_configure_args "--with-pmi-libdir=/usr/lib64/slurm"
+	fi
+	if (( V_MAJOR >= 5 )); then
+		pbuild::add_configure_args "--enable-prte-prefix-by-default"
+	fi
+        if (( V_MAJOR < 4 )); then
+		pbuild::add_configure_args "--enable-mpi-f90"
+		pbuild::add_configure_args "--enable-mpi-profile"
+		pbuild::add_configure_args "--enable-smp-locks"
+	fi
+        if (( V_MAJOR >= 4 )); then
+		pbuild::add_configure_args "--enable-mpi-fortran"
+		pbuild::add_configure_args "--without-verbs"
+	fi
+
+	if [[ -v CUDA_VERSION ]]; then
+		std::info "Enabling CUDA ${CUDA_VERSION}."
 		pbuild::add_configure_args "--with-cuda=${CUDA_HOME}"
 	fi
 
         if [[ -v HWLOC_VERSION ]]; then
                 unset HWLOC_VERSION
+		std::info "Enabling external hwloc ${HWLOC_PREFIX}."
 		pbuild::add_configure_args "--with-hwloc=${HWLOC_PREFIX}"
         else
        		pbuild::add_configure_args "--with-hwloc=internal"
         fi
 
 	if [[ -v LIBEVENT_VERSION ]]; then
+		std::info "Enabling libevent ${LIBEVENT_VERSION}."
                 pbuild::add_configure_args "--with-libevent=${LIBEVENT_PREFIX}"
         fi 
 
         if [[ -v PMIX_VERSION ]]; then
+		std::info "Enabling PMIX ${PMIX_VERSION}."
                 unset PMIX_VERSION
 		pbuild::add_configure_args "--with-pmix=${PMIX_PREFIX}"
         fi
 
+	if pbuild::use_flag merlin7 && [[ ! -v LIBFABRIC_VERSION ]]; then
+	      if pkg-config --exists libfabric; then
+	      	     std::info "Get LIBFABRIC_VERSION via pkg-config"
+	      	     LIBFABRIC_PREFIX=$(pkg-config --variable=prefix libfabric)
+	             LIBFABRIC_VERSION="$(LIBFABRIC_PREFIX##*/)"
+	      fi
+	fi
 	if [[ -v LIBFABRIC_VERSION ]]; then
+		std::info "Enabling libfabric ${LIBFABRIC_VERSION}."
                 pbuild::add_configure_args "--with-ofi=${LIBFABRIC_PREFIX}"
         fi 
-
+	
 	if [[ -v UCX_VERSION ]]; then
+		std::info "Enabling UCX ${UCX_VERSION}."
 		pbuild::add_configure_args "--with-ucx=${UCX_PREFIX}"
 	fi
 
@@ -48,53 +80,66 @@ pbuild::pre_configure() {
                 pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel,-O0"
         fi
 
+        if pbuild::use_flag slurm || \
+		pbuild::use_flag dgx || \
+		pbuild::use_flag merlin6 || \
+		pbuild::use_flag merlin7; then
+	    std::info "Enabling SLURM."
+	    pbuild::add_configure_args "--with-slurm=yes"
+	fi
         if pbuild::use_flag slurm || pbuild::use_flag dgx || pbuild::use_flag merlin6; then
+		std::info "Enabling GPFS."
 		pbuild::add_configure_args "--with-gpfs=/usr/lpp/mmfs"
-		pbuild::add_configure_args "--with-pmi"
-		# pbuild::add_configure_args "--with-pmi-libdir=/usr/lib64/"
-
-                if pbuild::use_flag "libpmix"; then
-                  pbuild::add_configure_args "--enable-install-libpmix"
-                fi
         fi
 
-	local version
-	(( version = (${V_MAJOR} * 100 + ${V_MINOR}) * 100 + V_PATCHLVL ))
-        if (( V_MAJOR < 4 )); then
-		pbuild::add_configure_args "--enable-mpi-f90"
-		pbuild::add_configure_args "--enable-mpi-profile"
-		pbuild::add_configure_args "--enable-smp-locks"
-	elif (( V_MAJOR >= 4 )); then
-		pbuild::add_configure_args "--enable-mpi-fortran"
-		pbuild::add_configure_args "--without-verbs"
-	fi
+        if pbuild::use_flag "libpmix"; then
+		std::info "Enabling install of libpmix."
+        	pbuild::add_configure_args "--enable-install-libpmix"
+        fi
+}
 
+pbuild::post_install_no_slurm() {
+	if ! pbuild::use_flag slurm && \
+			! pbuild::use_flag dgx && \
+			! pbuild::use_flag merlin6 && \
+			! pbuild::use_flag merlin7; then
+		mkdir -p "${PREFIX}/lib/fallback"
+		local -r binary=$(ls "${PREFIX}"/lib/libmpi.so.*.*.*)
+		pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libuc[mpst].so'
+		pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libuct_ib.so.0'
+		pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libnuma.so'
+		pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libibverbs.so'
+		pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/librdmacm.so'
+		pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libpmi.so'
+		pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libpmi2.so'
+		pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libpmi2.so'
+	fi
 }
 
 pbuild::post_install() {
-        if ! pbuild::use_flag slurm && ! pbuild::use_flag dgx && ! pbuild::use_flag merlin6; then
-	  mkdir -p "${PREFIX}/lib/fallback"
-	  local -r binary=$(ls "${PREFIX}"/lib/libmpi.so.*.*.*)
-	  pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libuc[mpst].so'
-	  pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libuct_ib.so.0'
-	  pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libnuma.so'
-	  pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libibverbs.so'
-	  pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/librdmacm.so'
-	  pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libpmi.so'
-	  pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libpmi2.so'
-	  pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libpmi2.so'
-	fi
-
 	if [[ -v CUDA_VERSION ]]; then
-	  echo "opal_warn_on_missing_libcuda = 0" >> ${PREFIX}/etc/openmpi-mca-params.conf
+		echo "opal_warn_on_missing_libcuda = 0" >> ${PREFIX}/etc/openmpi-mca-params.conf
 	fi
 
-        for FILE in $(find $PREFIX -type f \( ! -name "*.a" -and ! -name "*.mod" \) -exec grep -IL . "{}" \;)
-        do 
-          OLD_RPATH=$(objdump -a -x $FILE | grep RPATH | awk '{print $2}')
-          NEW_RPATH=$(echo $OLD_RPATH | sed 's/:\/usr\/lib64:/:/g')
-         if [[ "${OLD_RPATH}" != "${NEW_RPATH}" ]]; then
-           patchelf --force-rpath  --set-rpath "${NEW_RPATH}" "${FILE}"
-         fi
-        done
+	local fname=''
+	local old_rpath=''
+	local new_rpath=''
+	# remove '/usr/lib64' from RPATH/RUNPATH
+        while read fname; do
+		old_rpath=$(objdump -x "${fname}" | awk '/RPATH|RUNPATH/ {print $2}')
+		new_rpath=$(echo "${old_rpath}" | sed 's/:\/usr\/lib64:/:/g')
+		if [[ "${old_rpath}" != "${new_rpath}" ]]; then
+			patchelf \
+				--force-rpath \
+				--set-rpath "${new_rpath}" \
+				"${fname}"
+		fi
+        done < <(find "${PREFIX}" -type f \( ! -name "*.a" -and ! -name "*.mod" \) \
+		      -exec grep -IL . "{}" \;)
 }
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
diff --git a/Compiler/openmpi/files/config.yaml b/Compiler/openmpi/files/config.yaml
index afd076f..5a0e595 100644
--- a/Compiler/openmpi/files/config.yaml
+++ b/Compiler/openmpi/files/config.yaml
@@ -6,9 +6,11 @@ openmpi:
     group: Compiler
     overlay: base
     relstage: stable
-    systems: [rhel7, rhel8, rhel9]
+    configure_args:
+      - --enable-shared
+      - --enable-static
     docfiles: [AUTHORS, LICENSE, NEWS, README]
-    urls:
+    Urls:
       - url: https://download.open-mpi.org/release/open-mpi/v${V_MAJOR}.${V_MINOR}/openmpi-${V_PKG}.tar.bz2
   shasums:
     openmpi-1.10.0.tar.bz2: 26b432ce8dcbad250a9787402f2c999ecb6c25695b00c9c6ee05a306c78b6490
@@ -53,25 +55,74 @@ openmpi:
     openmpi-4.1.4.tar.bz2: 92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d
     openmpi-4.1.5.tar.bz2: a640986bc257389dd379886fdae6264c8cfa56bc98b71ce3ae3dfbd8ce61dbe3
     openmpi-4.1.6.tar.bz2: f740994485516deb63b5311af122c265179f5328a0d857a567b85db00b11e415
+    openmpi-5.0.5.tar.bz2: 6588d57c0a4bd299a24103f4e196051b29e8b55fbda49e11d5b3d32030a32776
 
   versions:
+    5.0.5:
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          relstage: unstable
+          overlay: Alps
+          use_overlays: [PSI]
+          use_flags: [merlin7]
+          group_deps:
+            compiler: {gcc: [12.3.0], intelcc: [22.2]}
+          build_requires: [pmix/5.0.3, hwloc/2.11.1, libfabric/1.15.2.0, patchelf/0.14.5]
+          runtime_deps: [cuda/12.2.0]
+          configure_args+:
+            - --with-ofi=${LIBFABRIC_VERSION}
+            - --enable-mpi1-compatibility
+            - --with-cxi
+            - --with-lustre
+            - --with-slingshot
+
     4.1.6:
+      config:
+        build_variants: first_match
       variants:
         - systems: [merlin-.*]
           suffix: _slurm
           relstage: unstable
-          overlay: private
-          use_overlays: [private]
+          overlay: base
           group_deps:
-            compiler: {gcc: [9.5.0, 10.4.0, 11.4.0, 12.3.0, 13.1.0]}
-          build_requires: [pmix/4.2.4, ucx/1.14.1_slurm, libfabric/1.18.0, hwloc/2.9.1, patchelf/0.14.5]
+            compiler: {gcc: [9.5.0, 10.4.0, 11.4.0, 12.3.0, 12.4.0, 13.1.0, 13.2.0, 14.2.0]}
+          build_requires:
+            - pmix/4.2.4
+            - ucx/1.14.1_slurm
+            - libfabric/1.18.0
+            - hwloc/2.9.1
+            - patchelf/0.14.5
           runtime_deps: [cuda/12.1.1]
+          configure_args+:
+            - CFLAGS=-g -O0
+            - LDFLAGS=-g
+            - --with-gpfs=/usr/lpp/mmfs
+            - --with-pmi=/usr
+
         - systems: [ra-.*]
           suffix: _ra
+          use_flags: [ra]
           group_deps:
             compiler: {gcc: [9.5.0, 10.4.0, 11.4.0, 12.3.0, 13.1.0]}
           build_requires: [pmix/4.2.4, ucx/1.14.1_slurm, hwloc/2.9.1, patchelf/0.14.5]
           runtime_deps: [cuda/12.1.1]
+          configure_args+:
+            - --with-gpfs=/usr/lpp/mmfs
+            - --with-pmi=/usr
+
+        - systems: [.*.merlin7.psi.ch]
+          relstage: unstable
+          overlay: Alps
+          group_deps:
+            compiler: {gcc: [12.3.0]}
+          build_requires: [pmix/4.2.9, hwloc/2.11.1, patchelf/0.14.5]
+          runtime_deps: [cuda/12.2.0]
+          configure_args+:
+            - --with-ofi=${LIBFABRIC_PREFIX}
+            - --enable-mpi1-compatibility
+            - --with-lustre
+          use_overlays: [PSI, Alps]
+          use_flags: [merlin7, slurm]
 
     4.1.4:
       variants:
diff --git a/Compiler/openmpi/files/variants.merlin7 b/Compiler/openmpi/files/variants.merlin7
new file mode 100644
index 0000000..3b81657
--- /dev/null
+++ b/Compiler/openmpi/files/variants.merlin7
@@ -0,0 +1,50 @@
+openmpi/3.1.4_merlin6   deprecated gcc/{7.4.0,8.3.0}
+
+openmpi/3.1.5_merlin6   deprecated gcc/{7.3.0,7.4.0,8.3.0,9.2.0}
+openmpi/3.1.5_merlin6   deprecated intel/{15.2,17.4,18.4}
+
+openmpi/3.1.5-1_merlin6 deprecated gcc/{7.3.0,7.4.0,8.3.0,9.2.0}
+openmpi/3.1.5-1_merlin6 deprecated intel/{15.2,17.4,18.4}
+
+openmpi/2.1.6_slurm     deprecated gcc/{4.9.4,5.5.0,6.5.0,7.4.0,8.3.0,9.2.0}
+openmpi/2.1.6_slurm     deprecated intel/{15.2,17.4,18.4}
+
+openmpi/3.0.5_slurm     deprecated  gcc/{4.9.4,5.5.0,6.5.0,7.4.0,8.3.0,9.2.0}
+openmpi/3.0.5_slurm     deprecated  intel/{15.2,17.4,18.4}
+
+openmpi/3.1.6_slurm     deprecated  gcc/{4.9.4,5.5.0,6.5.0}
+openmpi/3.1.6_slurm     stable      gcc/{7.5.0,8.4.0,9.3.0}
+openmpi/3.1.6_slurm     deprecated  intel/{15.2,17.4,18.4,20.1}
+openmpi/3.1.6_slurm     deprecated  intel/20.4 cuda/11.1.0
+
+openmpi/4.0.3_slurm     deprecated  gcc/{4.9.4,5.5.0,6.5.0,7.5.0,8.4.0,9.3.0}
+openmpi/4.0.3_slurm     deprecated  intel/{15.2,17.4,18.4,20.1}
+
+openmpi/4.0.4_slurm     deprecated  gcc/{4.9.4,5.5.0,6.5.0,7.5.0,8.4.0,9.3.0}
+openmpi/4.0.4_slurm     deprecated  intel/{15.2,17.4}
+openmpi/4.0.4_slurm     deprecated  intel/{18.4,20.1}
+
+openmpi/4.0.5_slurm     stable     gcc/9.2.0 cuda/11.0.3
+openmpi/4.0.5_slurm     stable     gcc/{8.4.0,9.3.0} cuda/11.1.0
+openmpi/4.0.5_slurm     stable     intel/20.4 cuda/11.1.0
+
+openmpi/4.0.5-1_slurm   stable     gcc/{8.4.0,9.3.0,10.2.0,10.3.0} cuda/11.2.2 b:ucx/1.10.0-1_slurm
+openmpi/4.0.5-2_slurm   stable     gcc/10.2.0 cuda/11.3.0 b:ucx/1.11.0_slurm
+
+openmpi/4.0.7_slurm     stable     gcc/10.2.0 cuda/11.5.1 b:ucx/1.11.2-2_slurm
+openmpi/4.0.7-1_slurm   stable     gcc/10.2.0 cuda/11.4.3 b:ucx/1.11.2-1_slurm
+
+openmpi/4.1.1_slurm     unstable   gcc/10.2.0 cuda/11.3.0 b:ucx/1.11.2_slurm
+openmpi/4.1.1-1_slurm   unstable   gcc/10.2.0 cuda/11.3.0 b:ucx/1.10.0_slurm
+
+openmpi/4.1.3_slurm     stable     gcc/{9.3.0,10.3.0,11.2.0} cuda/11.5.1 b:ucx/1.12.1_slurm
+openmpi/4.1.4_slurm     stable	   gcc/10.4.0 cuda/11.5.1 b:ucx/1.12.1_slurm
+
+openmpi/4.1.5_slurm     stable     gcc/{9.5.0,10.4.0,11.4.0,12.3.0,13.1.0} b:cuda/12.1.1 b:pmix/4.2.4 b:ucx/1.14.1_slurm b:libfabric/1.18.0 b:hwloc/2.9.1 b:patchelf/0.14.5
+openmpi/4.1.5_slurm     unstable   intelcc/22.2        b:cuda/12.1.1 b:pmix/4.2.4 b:ucx/1.14.1_slurm b:libfabric/1.18.0 b:hwloc/2.9.1 b:patchelf/0.14.5
+
+openmpi/4.0.5-1_dgx     deprecated gcc/{8.4.0,9.3.0,10.2.0} cuda/11.2.2 b:ucx/1.10.0-1_dgx
+openmpi/4.1.0-1_dgx     deprecated gcc/10.2.0 cuda/11.2.2 b:ucx/1.10.0-1_dgx
+
+
+openmpi/4.0.4_slurm_libpmix deprecated gcc/9.3.0
diff --git a/Libraries/libevent/build b/Libraries/libevent/build
index 1239be0..6e021f3 100755
--- a/Libraries/libevent/build
+++ b/Libraries/libevent/build
@@ -1,7 +1,2 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "https://github.com/libevent/libevent/releases/download/release-$V-stable/$P-$V-stable.tar.gz"
-pbuild::add_to_group 'Libraries'
-
-pbuild::install_docfiles 'LICENSE'
-
diff --git a/Libraries/libevent/files/config.yaml b/Libraries/libevent/files/config.yaml
new file mode 100644
index 0000000..23af643
--- /dev/null
+++ b/Libraries/libevent/files/config.yaml
@@ -0,0 +1,30 @@
+format: 1
+libevent:
+  defaults:
+    group: Libraries
+    relstage: stable
+    configure_args:
+      - --enable-shared
+      - --enable-static
+    docfiles:
+      - LICENSE
+    urls:
+      - url: https://github.com/libevent/libevent/releases/download/release-$V-stable/$P-$V-stable.tar.gz
+  shasums:
+    libevent-2.1.8-stable.tar.gz: 965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2
+    libevent-2.1.12-stable.tar.gz: 92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
+  versions:
+    2.1.12:
+      config:
+        runtime_deps: []
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          overlay: Alps
+          use_overlays: [PSI]
+          build_requires: []
+          relstage: unstable
+        - systems: [rhel.*]
+          build_requires: [openssl/1.1.1k]
+    2.1.8:
+      config:
+        build_requires: [openssl/1.0.2r]
diff --git a/Libraries/pmix/build b/Libraries/pmix/build
index a058988..952d750 100755
--- a/Libraries/pmix/build
+++ b/Libraries/pmix/build
@@ -1,38 +1,20 @@
 #!/usr/bin/env modbuild
 
-echo "https://github.com/openpmix/openpmix/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz"
-pbuild::set_download_url "https://github.com/openpmix/openpmix/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz"
-
-pbuild::add_to_group 'Libraries'
-
-(( version = (${V_MAJOR} * 100 + ${V_MINOR}) * 100 + V_PATCHLVL ))
-if (( V_MAJOR > 1 )); then
-  pbuild::install_docfiles AUTHORS README.md LICENSE NEWS VERSION
-else 
-  pbuild::install_docfiles README LICENSE NEWS VERSION
-fi
-
-pbuild::compile_in_sourcetree
-
 pbuild::pre_configure() {
-  if [[ -n "${HWLOC_PREFIX}" ]]; then
-    pbuild::add_configure_args "--with-hwloc=${HWLOC_PREFIX}"
-  fi
+	if [[ -v HWLOC_PREFIX ]]; then
+		pbuild::add_configure_args "--with-hwloc=${HWLOC_PREFIX}"
+	fi
 
-  if [[ -n "${LIBEVENT_PREFIX}" ]]; then
-    pbuild::add_configure_args "--with-libevent=${LIBEVENT_PREFIX}"
-  fi
+	if [[ -v LIBEVENT_PREFIX ]]; then
+		pbuild::add_configure_args "--with-libevent=${LIBEVENT_PREFIX}"
+	fi
 
-  if [[ -n "${INTEL_VERSION}" ]]; then
-          pbuild::add_configure_args "CC=icc"
-          pbuild::add_configure_args "CXX=icpc"
-          pbuild::add_configure_args "FC=ifort"
-          pbuild::add_configure_args "F77=ifort"
-          pbuild::add_configure_args "F90=ifort"
-          # pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel"
-  fi
-
-  # pbuild::add_configure_args "--enable-pmi-backward-compatibility"
-  pbuild::add_configure_args "--enable-shared"
-  pbuild::add_configure_args "--enable-static"
+	if [[ -v INTEL_VERSION ]]; then
+		pbuild::add_configure_args "CC=icc"
+		build::add_configure_args "CXX=icpc"
+		pbuild::add_configure_args "FC=ifort"
+		pbuild::add_configure_args "F77=ifort"
+		pbuild::add_configure_args "F90=ifort"
+		# pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel"
+	fi
 }
diff --git a/Libraries/pmix/build-xml b/Libraries/pmix/build-xml
deleted file mode 100755
index 1ebd0fd..0000000
--- a/Libraries/pmix/build-xml
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env modbuild
-
-pbuild::pre_configure() {
-  if [[ -v HWLOC_PREFIX ]]; then
-    pbuild::add_configure_args "--with-hwloc=${HWLOC_PREFIX}"
-  fi
-
-  if [[ -v LIBEVENT_PREFIX ]]; then
-    pbuild::add_configure_args "--with-libevent=${LIBEVENT_PREFIX}"
-  fi
-
-  if [[ -v INTEL_VERSION ]]; then
-          pbuild::add_configure_args "CC=icc"
-          pbuild::add_configure_args "CXX=icpc"
-          pbuild::add_configure_args "FC=ifort"
-          pbuild::add_configure_args "F77=ifort"
-          pbuild::add_configure_args "F90=ifort"
-          # pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel"
-  fi
-
-  # pbuild::add_configure_args "--enable-pmi-backward-compatibility"
-  pbuild::add_configure_args "--enable-shared"
-  pbuild::add_configure_args "--enable-static"
-}
diff --git a/Libraries/pmix/files/config.yaml b/Libraries/pmix/files/config.yaml
index 4585449..14db2dc 100644
--- a/Libraries/pmix/files/config.yaml
+++ b/Libraries/pmix/files/config.yaml
@@ -3,7 +3,10 @@ pmix:
   defaults:
     group: Libraries
     relstage: stable
-    compile_in_sourcetree: yes
+    compile_in_sourcetree: true
+    configure_args:
+      - --enable-shared
+      - --enable-static
     docfiles:
       - AUTHORS
       - README.md
@@ -11,14 +14,18 @@ pmix:
       - NEWS
       - VERSION
     urls:
-      - url: "https://github.com/openpmix/openpmix/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz"
+      - url: https://github.com/openpmix/openpmix/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz
   shasums:
     pmix-1.2.5.tar.gz: d7337601c5b985743e6b6f79ec1a34dfc2aefbb2d04d40b2c0d5bd7100d268ed
     pmix-2.2.5.tar.gz: db24480fa5be080e1ddcb273098992b69f8f21e4cd6b8df1682e836b303a2a6f
+    pmix-2.2.5.tar.gz: db24480fa5be080e1ddcb273098992b69f8f21e4cd6b8df1682e836b303a2a6f
     pmix-3.2.3.tar.gz: 1325a1355d0794196bb47665053fdbc588f9183aa5385f3581b668427316306e
+    pmix-3.2.5.tar.gz: 61385a65b172bfbe8d5363c3cd8f7742cd81049ebb3d8acc0d25806935641584
     pmix-4.1.2.tar.gz: a7a6d5b322c261999ce0a6395c0ac7dc359c0ff61380ed4c6935430fb9f5f6e6
     pmix-4.2.3.tar.gz: fd45e18e483e42089d4059df9753d9be3cfb68297a05981b1d937e09f7716d5a
     pmix-4.2.4.tar.gz: f1fe5fe817ac447ce8d3d88486a1c0d22227efd186e11062aa1f7b0f093089c6
+    pmix-4.2.9.tar.gz: 00ddb36fb81c31519972079a218c3cdd903510fc3910abaf4d484068fa29e884
+    pmix-5.0.3.tar.gz: d9b0b81ba45f58f44573796eb05858061ed7f47ea6b29af8058090023e35dfa9
   versions:
     1.2.5:
       config:
@@ -31,14 +38,30 @@ pmix:
     2.2.5;3.2.3:
       config:
         relstage: unstable
-    4.1.2:
+        runtime_deps: [libevent/2.1.12]
+        build_requires: [gcc/12.3.0, hwloc/2.11.1]
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          overlay: Alps
+          use_overlays: [PSI]
+        - systems: [rhel.*]
+    3.2.5:
       config:
         relstage: unstable
         runtime_deps: [libevent/2.1.12]
+        build_requires: [gcc/12.3.0, hwloc/2.11.1]
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          overlay: Alps
+          use_overlays: [PSI]
+    4.1.2:
+      config:
+        relstage: stable
+        runtime_deps: [libevent/2.1.12]
         build_requires: [hwloc/2.7.1]
     4.2.3:
       config:
-        relstage: unstable
+        relstage: stable
         runtime_deps: [libevent/2.1.12]
         build_requires: [hwloc/2.9.1]
     4.2.4:
@@ -46,3 +69,29 @@ pmix:
         relstage: stable
         runtime_deps: [libevent/2.1.12]
         build_requires: [gcc/10.4.0, hwloc/2.9.1]
+    4.2.9:
+      config:
+        relstage: unstable
+        runtime_deps: [libevent/2.1.12]
+        build_requires: [gcc/12.3.0, hwloc/2.11.1]
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          overlay: Alps
+          use_overlays: [PSI]
+    5.0.3:
+      config:
+        relstage: unstable
+        runtime_deps: [libevent/2.1.12]
+        build_requires: [gcc/12.3.0, hwloc/2.11.1]
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          overlay: Alps
+          use_overlays: [PSI]
+          configure_args+:
+            - --with-lustre
+          # - --with-cxi
+          # - --with-slingshot
+          # - --with-zlib
+          # - --with-jansson
+          # - --with-curl
+        - systems: [rhel.*]
diff --git a/Programming/cuda/files/variants.rhel7 b/Programming/cuda/files/variants.rhel7
index dc9872f..f9ac67e 100644
--- a/Programming/cuda/files/variants.rhel7
+++ b/Programming/cuda/files/variants.rhel7
@@ -13,3 +13,4 @@ cuda/11.4.3     stable
 cuda/11.5.1     stable
 cuda/11.8.0     stable
 cuda/12.1.1     stable
+cuda/12.2.0     unstable