diff --git a/gating.yaml b/gating.yaml
index 0bada96..fea3f72 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,16 +1,26 @@
 --- !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}
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/nm.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}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./nm.functional}
\ No newline at end of file
diff --git a/plans/nm.fmf b/plans/nm.fmf
deleted file mode 100644
index 4934d73..0000000
--- a/plans/nm.fmf
+++ /dev/null
@@ -1,11 +0,0 @@
-summary: Run Network Manager tests
-prepare:
-  how: install
-  packages: git-core
-execute:
-  how: tmt
-  script: |
-    dnf install -y git-core
-    git clone https://gitlab.freedesktop.org/NetworkManager/NetworkManager-ci.git
-    cd NetworkManager-ci
-    ./run/osci/run-tests dnsmasq
diff --git a/plans/public.fmf b/plans/public.fmf
deleted file mode 100644
index e057666..0000000
--- a/plans/public.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Run all beakerlib tests for dnsmasq
-discover:
-  - name: fedora_tests_dnsmasq
-    how: fmf
-    url: https://src.fedoraproject.org/tests/dnsmasq.git
-execute:
-    how: tmt
diff --git a/plans/tier1-public.fmf b/plans/tier1-public.fmf
deleted file mode 100644
index f40451a..0000000
--- a/plans/tier1-public.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-summary: Combine all availabe beakerlib tests for dnsmasq
-discover:
-  - name: fedora_tests_dnsmasq
-    how: fmf
-    url: https://src.fedoraproject.org/tests/dnsmasq.git
-    filter: 'tier: 1'
-execute:
-    how: tmt