diff --git a/gating.yaml b/gating.yaml
index 2019416..1b16508 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,9 +1,25 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
+#Rawhide
+--- !Policy
+product_versions:
+  - fedora-*
+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: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
\ No newline at end of file
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..29c2901
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,36 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/telnet.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/telnet.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/telnet.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/telnet.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/telnet.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/telnet.git
+      name: /plans/others/public
+
diff --git a/plans/public.fmf b/plans/public.fmf
deleted file mode 100644
index da57aee..0000000
--- a/plans/public.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Test plan that runs all tests from tests repo.
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/telnet.git
-execute:
-    how: tmt
-
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
deleted file mode 100644
index 64f46fc..0000000
--- a/plans/tier1-internal.fmf
+++ /dev/null
@@ -1,11 +0,0 @@
-summary: CI plan, picks Tier1 tests, runs in beakerlib.
-discover:
-  - name: rhel
-    how: fmf
-    filter: 'tier: 1'
-    url: git://pkgs.devel.redhat.com/tests/telnet
-execute:
-    how: tmt
-adjust:     
-    enabled: false     
-    when: distro == centos-stream-9