diff --git a/Compiler/impi/build b/Compiler/impi/build
index 84a2e40..6e021f3 100755
--- a/Compiler/impi/build
+++ b/Compiler/impi/build
@@ -1,20 +1,2 @@
 #!/usr/bin/env modbuild
 
-pbuild::add_to_group 'Compiler'
-
-pbuild::prep() {
-	:
-}
-
-pbuild::configure() {
-	:
-}
-
-pbuild::compile() {
-	:
-}
-
-pbuild::install() {
-	:
-}
-
diff --git a/Compiler/impi/files/config.yaml b/Compiler/impi/files/config.yaml
new file mode 100644
index 0000000..df534a9
--- /dev/null
+++ b/Compiler/impi/files/config.yaml
@@ -0,0 +1,105 @@
+---
+# yamllint disable rule:line-length
+format: 1
+impi:
+  defaults:
+    group: Compiler
+    overlay: base
+    relstage: stable
+    build_functions:
+      prep: []
+      configure: []
+      compile: []
+      install: []
+
+  versions:
+    22.2:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          group_deps:
+            compiler:
+              intel: [22.2]
+
+    22.1:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          group_deps:
+            compiler:
+              intel: [22.1]
+
+    21.4:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          group_deps:
+            compiler:
+              intel: [21.4]
+
+    20.4:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          group_deps:
+            compiler:
+              intel: [20.4]
+
+    19.4:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [19.4]
+
+    19.3:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [19.3]
+
+    18.4:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [18.4]
+    18.3:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [18.3]
+
+    18.2:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [18.2]
+ 
+   17.8:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [17.8]
+
+   5.1:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [16.1, 16.2, 16.3, 17.1]
+   5.0:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [15.2, 15.3]
+
diff --git a/Compiler/impi/files/variants.rhel6 b/Compiler/impi/files/variants.rhel6
deleted file mode 100644
index 01ef3a6..0000000
--- a/Compiler/impi/files/variants.rhel6
+++ /dev/null
@@ -1,16 +0,0 @@
-impi/5.0        deprecated	intel/15.2
-impi/5.0        deprecated	intel/15.3
-impi/5.1        deprecated	intel/16.1
-impi/5.1        deprecated	intel/16.2
-impi/5.1        deprecated	intel/16.3
-impi/5.1        deprecated	intel/17.1
-impi/17.8       deprecated	intel/17.8
-impi/18.2       deprecated	intel/18.2
-impi/18.3       deprecated	intel/18.3
-impi/18.4       deprecated	intel/18.4
-impi/19.3       deprecated	intel/19.3
-impi/19.4	deprecated	intel/19.4
-impi/20.4	stable	        intel/20.4
-impi/21.4	stable	        intel/21.4
-impi/22.1	stable	        intel/22.1
-impi/22.2	unstable	intel/22.2
diff --git a/MPI/arpack-ng/build b/MPI/arpack-ng/build
new file mode 100755
index 0000000..6e021f3
--- /dev/null
+++ b/MPI/arpack-ng/build
@@ -0,0 +1,2 @@
+#!/usr/bin/env modbuild
+
diff --git a/MPI/arpack-ng/files/config.yaml b/MPI/arpack-ng/files/config.yaml
new file mode 100644
index 0000000..3c44850
--- /dev/null
+++ b/MPI/arpack-ng/files/config.yaml
@@ -0,0 +1,37 @@
+---
+# yamllint disable rule:line-length
+format: 1
+arpack-ng:
+  defaults:
+    group: MPI
+    overlay: base
+    relstage: stable
+    systems: [.*]
+    docfiles:
+      - Copyright.txt
+      - LICENSE
+      - README
+      - RELEASE_NOTES
+    urls:
+      - url: https://github.com/opencollab/$P/archive/refs/tags/${V_PKG}.tar.gz
+        name: $P-${V_PKG}.tar.gz
+
+  shasums:
+    arpack-ng-3.9.0.tar.gz: 24f2a2b259992d3c797d80f626878aa8e2ed5009d549dad57854bbcfb95e1ed0
+
+  versions:
+    3.9.0:
+      variants:
+        - group_deps:
+            compiler:
+              intel: [22.2]
+            mpi:
+              impi: [22.2]
+          configure_args:
+            - -DCMAKE_BUILD_TYPE:STRING=Release
+            - -DMPI="ON"
+            - -DICB="ON"
+            - -DBUILD_SHARED_LIBS="ON"
+            - -DCMAKE_POSITION_INDEPENDENT_CODE="ON"
+          build_requires: [cmake/3.25.2]
+
diff --git a/MPI/arpack-ng/modulefile b/MPI/arpack-ng/modulefile
new file mode 100644
index 0000000..e802488
--- /dev/null
+++ b/MPI/arpack-ng/modulefile
@@ -0,0 +1,17 @@
+#%Module1.0
+
+module-whatis		"collection of Fortran77 subroutines designed to solve large scale eigenvalue problems"
+module-url		"https://github.com/opencollab/arpack-ng/tree/master"
+module-license		"BSD Software License"
+module-maintainer	"Elsa Germann <elsa.germann@psi.ch>"
+
+module-help		"
+This project started as a joint project between Debian, Octave and Scilab
+in order to provide a common and maintained version of arpack. This is now
+a community project maintained by a few volunteers. Indeed, no single release
+has been published by Rice university for the last few years and since many
+software (Octave, Scilab, R, Matlab...) forked it and implemented their own
+modifications, arpack-ng aims to tackle this by providing a common repository,
+maintained versions with a testsuite. arpack-ng is replacing arpack almost
+everywhere.
+"