diff --git a/gating.yaml b/gating.yaml
index 086fac0..b8d65b0 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,11 +1,25 @@
 --- !Policy
 product_versions:
-  - rhel-8
+  - 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: osci.brew-build./plans/internal/tier1-internal.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/internal/Acceptance-internal.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public/tier1-public.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public/Acceptance-public.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
+  - !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..d076dba
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,35 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/frr.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/frr.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/frr.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/frr.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/frr.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/frr.git
+      name: /plans/others/public
diff --git a/plans/internal/Acceptance-internal.fmf b/plans/internal/Acceptance-internal.fmf
deleted file mode 100644
index 176a236..0000000
--- a/plans/internal/Acceptance-internal.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Internal Acceptance tests plan
-discover:
-    how: fmf
-    filter: 'tag: Acceptance'
-    url: git://pkgs.devel.redhat.com/tests/frr
-execute:
-    how: tmt
-adjust:     
-    enabled: false     
-    when: distro == centos-stream or distro == fedora
\ No newline at end of file
diff --git a/plans/internal/other-internal.fmf b/plans/internal/other-internal.fmf
deleted file mode 100644
index d374ff1..0000000
--- a/plans/internal/other-internal.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Internal Other tests plan
-discover:
-    how: fmf
-    filter: 'tier: -1 & tier: -2 & tier: -3 & tag: -Acceptance & tag: -multihost'
-    url: git://pkgs.devel.redhat.com/tests/frr
-execute:
-    how: tmt
-adjust:     
-    enabled: false     
-    when: distro == centos-stream or distro == fedora
\ No newline at end of file
diff --git a/plans/internal/tier1-internal.fmf b/plans/internal/tier1-internal.fmf
deleted file mode 100644
index 237a86e..0000000
--- a/plans/internal/tier1-internal.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Internal Tier1 tests plan
-discover:
-    how: fmf
-    filter: 'tier: 1'
-    url: git://pkgs.devel.redhat.com/tests/frr
-execute:
-    how: tmt
-adjust:     
-    enabled: false     
-    when: distro == centos-stream or distro == fedora
\ No newline at end of file
diff --git a/plans/internal/tier2-internal.fmf b/plans/internal/tier2-internal.fmf
deleted file mode 100644
index d7fcc46..0000000
--- a/plans/internal/tier2-internal.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Internal Tier2 tests plan
-discover:
-    how: fmf
-    filter: 'tier: 2'
-    url: git://pkgs.devel.redhat.com/tests/frr
-execute:
-    how: tmt
-adjust:     
-    enabled: false     
-    when: distro == centos-stream or distro == fedora
\ No newline at end of file
diff --git a/plans/internal/tier3-internal.fmf b/plans/internal/tier3-internal.fmf
deleted file mode 100644
index 5688267..0000000
--- a/plans/internal/tier3-internal.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Internal Tier3 tests plan
-discover:
-    how: fmf
-    filter: 'tier: 3'
-    url: git://pkgs.devel.redhat.com/tests/frr
-execute:
-    how: tmt
-adjust:     
-    enabled: false     
-    when: distro == centos-stream or distro == fedora
\ No newline at end of file
diff --git a/plans/public/Acceptance-public.fmf b/plans/public/Acceptance-public.fmf
deleted file mode 100644
index 8781b3e..0000000
--- a/plans/public/Acceptance-public.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-Summary: Public Acceptance tests plan
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/frr.git
-    filter: 'tag: Acceptance'
-execute:
-    how: tmt
diff --git a/plans/public/other-public.fmf b/plans/public/other-public.fmf
deleted file mode 100644
index 9e4df6e..0000000
--- a/plans/public/other-public.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-Summary: Public other tests plan
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/frr.git
-    filter: 'tier: -1 & tier: -2 & tier: -3 & tag: -Acceptance & tag: -multihost'
-execute:
-    how: tmt
diff --git a/plans/public/tier1-public.fmf b/plans/public/tier1-public.fmf
deleted file mode 100644
index cf2e8d5..0000000
--- a/plans/public/tier1-public.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-Summary: Public Tier1 tests plan
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/frr.git
-    filter: 'tier: 1'
-execute:
-    how: tmt
diff --git a/plans/public/tier2-public.fmf b/plans/public/tier2-public.fmf
deleted file mode 100644
index e9a13c0..0000000
--- a/plans/public/tier2-public.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-Summary: Public Tier2 tests plan
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/frr.git
-    filter: 'tier: 2'
-execute:
-    how: tmt
diff --git a/plans/public/tier3-public.fmf b/plans/public/tier3-public.fmf
deleted file mode 100644
index 7ba9e3c..0000000
--- a/plans/public/tier3-public.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-Summary: Public Tier3 tests plan
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/frr.git
-    filter: 'tier: 3'
-execute:
-    how: tmt