diff --git a/Compiler/OpenBLAS/files/variants.rhel6 b/Compiler/OpenBLAS/files/variants.rhel6
deleted file mode 100644
index c467201..0000000
--- a/Compiler/OpenBLAS/files/variants.rhel6
+++ /dev/null
@@ -1,13 +0,0 @@
-OpenBLAS/0.2.9		stable		gcc/{4.7.4,4.8.3,4.8.4,4.8.5,4.9.2,6.1.0,6.2.0}
-OpenBLAS/0.2.9		deprecated	intel/15.3
-OpenBLAS/0.2.19		stable		gcc/{4.8.5,4.9.4,5.3.0,5.4.0,6.2.0,6.3.0}
-
-OpenBLAS/0.2.20		stable		gcc/{5.5.0,6.4.0,7.3.0}
-OpenBLAS/0.2.20		deprecated	intel/17.4
-
-OpenBLAS/0.3.7		stable		gcc/{7.4.0,8.3.0,9.2.0}
-
-OpenBLAS/0.3.9		stable		gcc/{7.5.0,8.4.0,9.3.0,10.1.0}
-OpenBLAS/0.3.10		stable		gcc/{7.5.0,8.4.0,9.3.0,10.1.0}
-OpenBLAS/0.3.13		stable		gcc/{7.5.0,8.4.0,9.3.0,10.2.0,10.3.0} b:cmake/3.15.5 b:binutils/2.29
-OpenBLAS/0.3.15		stable		gcc/{7.5.0,8.4.0,9.3.0,10.3.0} b:cmake/3.15.5 b:binutils/2.29
diff --git a/Compiler/OpenBLAS/files/variants.yaml b/Compiler/OpenBLAS/files/variants.yaml
new file mode 100644
index 0000000..0c1ad9a
--- /dev/null
+++ b/Compiler/OpenBLAS/files/variants.yaml
@@ -0,0 +1,28 @@
+overlay: base
+relstage: stable
+
+OpenBLAS/0.2.9:
+  - with: gcc/{4.7.4,4.8.3,4.8.4,4.8.5,4.9.2,6.1.0,6.2.0}
+OpenBLAS/0.2.9:
+  - with: intel/15.3
+    relstage: deprecated
+OpenBLAS/0.2.19:
+  - with: gcc/{4.8.5,4.9.4,5.3.0,5.4.0,6.2.0,6.3.0}
+OpenBLAS/0.2.20:
+  - with: gcc/{5.5.0,6.4.0,7.3.0}
+OpenBLAS/0.2.20:
+  - with: intel/17.4
+    relstage: deprecated
+
+OpenBLAS/0.3.7:
+  - with: gcc/{7.4.0,8.3.0,9.2.0}
+OpenBLAS/0.3.9:
+  - with: gcc/{7.5.0,8.4.0,9.3.0,10.1.0}
+OpenBLAS/0.3.10:
+  - with: gcc/{7.5.0,8.4.0,9.3.0,10.1.0}
+OpenBLAS/0.3.13:
+  - with: gcc/{7.5.0,8.4.0,9.3.0,10.2.0,10.3.0} b:cmake/3.15.5 b:binutils/2.29
+OpenBLAS/0.3.15:
+  - with: gcc/{7.5.0,8.4.0,9.3.0,10.3.0} b:cmake/3.15.5 b:binutils/2.29
+OpenBLAS/0.3.20:
+  - with: gcc/{7.5.0,8.5.0,9.5.0,10.3.0,11.3.0,12.1.0} b:cmake/3.15.5 b:binutils/2.29