diff --git a/Tools/ANSYS/build b/Tools/ANSYS/build
index b961793..595506c 100755
--- a/Tools/ANSYS/build
+++ b/Tools/ANSYS/build
@@ -1,7 +1,5 @@
 #!/usr/bin/env modbuild
 
-pbuild::add_to_group 'Tools'
-
 pbuild::prep() {
 	:
 }
diff --git a/Tools/ANSYS/files/config.yaml b/Tools/ANSYS/files/config.yaml
new file mode 100644
index 0000000..7daa5fb
--- /dev/null
+++ b/Tools/ANSYS/files/config.yaml
@@ -0,0 +1,28 @@
+format: 1
+ANSYS:
+  defaults:
+    group: Tools
+    relstage: stable
+  shasums:
+  versions:
+    2024R2:
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          relstage: stable
+          overlay: merlin
+          use_overlays: [PSI]
+          use_flags: [merlin7]
+    2023R2:
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          relstage: unstable
+          overlay: merlin
+          use_overlays: [PSI]
+          use_flags: [merlin7]
+    2022R2:
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          relstage: stable
+          overlay: merlin
+          use_overlays: [PSI]
+          use_flags: [merlin7]
diff --git a/Tools/ANSYS/files/variants.overlay_alps b/Tools/ANSYS/files/variants.overlay_alps
index 8852d90..3353250 100644
--- a/Tools/ANSYS/files/variants.overlay_alps
+++ b/Tools/ANSYS/files/variants.overlay_alps
@@ -1 +1,2 @@
 ANSYS/2022R2    stable
+ANSYS/2024R1    stable
diff --git a/Tools/ANSYS/files/variants.overlay_merlin b/Tools/ANSYS/files/variants.overlay_merlin
index c7ad54d..3b872ee 100644
--- a/Tools/ANSYS/files/variants.overlay_merlin
+++ b/Tools/ANSYS/files/variants.overlay_merlin
@@ -3,5 +3,5 @@ ANSYS/2020R2    stable
 ANSYS/2021R1    stable
 ANSYS/2021R2    stable
 ANSYS/2022R1    stable
-ANSYS/2022R2    unstable
-ANSYS/2023R2    unstable
+ANSYS/2022R2    stable
+ANSYS/2023R2    stable