diff --git a/gating.yaml b/gating.yaml
index 15acaee..1b16508 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,25 +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.tier0.functional}
+  - !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.tier0.functional}
-
+  - !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/internal/tier1-internal.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public/tier1-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..92c658e
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,36 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/cyrus-imapd.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/cyrus-imapd.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/cyrus-imapd.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/cyrus-imapd.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/cyrus-imapd.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/cyrus-imapd.git
+      name: /plans/others/public
+
diff --git a/plans/internal/other-internal.fmf b/plans/internal/other-internal.fmf
deleted file mode 100644
index 68ea43f..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'
-    url: git://pkgs.devel.redhat.com/tests/cyrus-imapd
-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 378d390..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/cyrus-imapd
-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 e83880e..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/cyrus-imapd
-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 5aa7276..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/cyrus-imapd
-execute:
-    how: tmt
-adjust:     
-    enabled: false     
-    when: distro == centos-stream or distro == fedora
\ No newline at end of file
diff --git a/plans/public/other-public.fmf b/plans/public/other-public.fmf
deleted file mode 100644
index 34684a3..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/cyrus-imapd.git
-    filter: 'tier: -1 & tier: -2 & tier: -3'
-execute:
-    how: tmt
diff --git a/plans/public/tier1-public.fmf b/plans/public/tier1-public.fmf
deleted file mode 100644
index cc59bae..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/cyrus-imapd.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 cda0f2f..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/cyrus-imapd.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 a9bbfa7..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/cyrus-imapd.git
-    filter: 'tier: 3'
-execute:
-    how: tmt