diff --git a/Tools/openssl/files/variants.rhel6 b/Tools/openssl/files/variants.rhel6
deleted file mode 100644
index feccbf2..0000000
--- a/Tools/openssl/files/variants.rhel6
+++ /dev/null
@@ -1,7 +0,0 @@
-openssl/1.0.2h		deprecated
-openssl/1.0.2j		deprecated
-openssl/1.0.2o		deprecated
-openssl/1.0.2r		stable
-openssl/1.1.1g		stable
-openssl/1.1.1k		stable
-openssl/1.1.1l		stable
diff --git a/Tools/openssl/files/variants.yaml b/Tools/openssl/files/variants.yaml
new file mode 100644
index 0000000..dc5afaa
--- /dev/null
+++ b/Tools/openssl/files/variants.yaml
@@ -0,0 +1,26 @@
+overlay: base
+relstage: stable
+openssl/1.0.2h:
+  - systems: rhel6
+    relstage: deprecated
+openssl/1.0.2j:
+  - systems: rhel6
+    relstage: deprecated
+openssl/1.0.2m:
+  - systems: rhel6
+    relstage: deprecated
+openssl/1.0.2o:
+  - systems: rhel6
+    relstage: deprecated
+openssl/1.0.2r:
+  - systems: rhel6
+openssl/1.1.1g:
+  - systems: rhel6
+openssl/1.1.1k:
+  - systems: rhel6
+openssl/1.1.1l:
+  - systems: rhel6
+openssl/1.1.1m:
+  - systems: rhel7
+openssl/1.1.1q:
+  - systems: rhel7