diff --git a/gating.yaml b/gating.yaml
index e4c04e7..8085288 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,16 +1,25 @@
 --- !Policy
 product_versions:
   - fedora-*
-decision_contexts: [bodhi_update_push_testing]
+decision_context: bodhi_update_push_testing
 subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
-
-#gating rawhide
+ 
+#Rawhide
 --- !Policy
 product_versions:
   - fedora-*
-decision_contexts: [bodhi_update_push_stable]
+decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
+#gating rhel
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..9b302b4
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,35 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/bind.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/bind.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/bind.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/bind.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/bind.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/bind.git
+      name: /plans/others/public
diff --git a/plans/all.fmf b/plans/all.fmf
deleted file mode 100644
index 03bf500..0000000
--- a/plans/all.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Test plan with all beakerlib tests
-environment+:
-    PACKAGE: bind
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/bind.git
-execute:
-    how: tmt
-context:
-    component: bind
diff --git a/plans/tier1-public.fmf b/plans/tier1-public.fmf
deleted file mode 100644
index e5b273a..0000000
--- a/plans/tier1-public.fmf
+++ /dev/null
@@ -1,11 +0,0 @@
-summary: Public (Fedora) Tier1 beakerlib tests
-environment+:
-    PACKAGE: bind
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/bind.git
-    filter: 'tier: 1'
-execute:
-    how: tmt
-context:
-    component: bind