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/files/config.yaml b/Compiler/openmpi/files/config.yaml
index c756bff..03f28e0 100644
--- a/Compiler/openmpi/files/config.yaml
+++ b/Compiler/openmpi/files/config.yaml
@@ -67,7 +67,7 @@ openmpi:
           overlay: Alps
           use_overlays: [PSI]
           group_deps:
-            compiler: {gcc: [12.3.0]}
+            compiler: {gcc: [12.3.0], intelcc: [22.2]}
           build_requires: [pmix/5.0.3, hwloc/2.11.1, patchelf/0.14.5]
           runtime_deps: [cuda/12.2.0]
           configure_args+:
diff --git a/Libraries/pmix/files/config.yaml b/Libraries/pmix/files/config.yaml
index be050d3..14db2dc 100644
--- a/Libraries/pmix/files/config.yaml
+++ b/Libraries/pmix/files/config.yaml
@@ -87,11 +87,11 @@ pmix:
         - systems: [.*.merlin7.psi.ch]
           overlay: Alps
           use_overlays: [PSI]
-          # configure_args+:
-          #   - --with-cxi
-          #   - --with-lustre
-          #   - --with-slingshot
-          #   - --with-zlib
-          #   - --with-jansson
-          #   - --with-curl
+          configure_args+:
+            - --with-lustre
+          # - --with-cxi
+          # - --with-slingshot
+          # - --with-zlib
+          # - --with-jansson
+          # - --with-curl
         - systems: [rhel.*]