diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index 195c6fe..254b6f3 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,16 +1,7 @@
 --- !Policy
 product_versions:
-  - fedora-*
-decision_contexts: [bodhi_update_push_testing]
-subject_type: koji_build
+  - rhel-*
+decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
- 
-#gating rawhide
---- !Policy
-product_versions:
-  - fedora-*
-decision_contexts: [bodhi_update_push_stable]
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
\ No newline at end of file
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/internal/tier1-internal.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public/tier1-public.functional}
\ No newline at end of file
diff --git a/plans/all.fmf b/plans/all.fmf
deleted file mode 100644
index 18bccad..0000000
--- a/plans/all.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: Test plan with all Fedora tests
-discover:
-       how: fmf
-       url: https://src.fedoraproject.org/tests/wireshark.git
-execute:
-       how: tmt
diff --git a/plans/internal/other-internal.fmf b/plans/internal/other-internal.fmf
new file mode 100644
index 0000000..7702aaf
--- /dev/null
+++ b/plans/internal/other-internal.fmf
@@ -0,0 +1,10 @@
+summary: Internal Other tests plan
+discover:
+    how: fmf
+    filter: 'tier: -1 & tier: -2 & tier: -3'
+    url: git://pkgs.devel.redhat.com/tests/wireshark
+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
new file mode 100644
index 0000000..316b62e
--- /dev/null
+++ b/plans/internal/tier1-internal.fmf
@@ -0,0 +1,10 @@
+summary: Internal Tier1 tests plan
+discover:
+    how: fmf
+    filter: 'tier: 1'
+    url: git://pkgs.devel.redhat.com/tests/wireshark
+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
new file mode 100644
index 0000000..579bd04
--- /dev/null
+++ b/plans/internal/tier2-internal.fmf
@@ -0,0 +1,10 @@
+summary: Internal Tier2 tests plan
+discover:
+    how: fmf
+    filter: 'tier: 2'
+    url: git://pkgs.devel.redhat.com/tests/wireshark
+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
new file mode 100644
index 0000000..7657cdc
--- /dev/null
+++ b/plans/internal/tier3-internal.fmf
@@ -0,0 +1,10 @@
+summary: Internal Tier3 tests plan
+discover:
+    how: fmf
+    filter: 'tier: 3'
+    url: git://pkgs.devel.redhat.com/tests/wireshark
+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
new file mode 100644
index 0000000..6e4b9ef
--- /dev/null
+++ b/plans/public/other-public.fmf
@@ -0,0 +1,7 @@
+Summary: Public other tests plan
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/wireshark.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
new file mode 100644
index 0000000..45f53aa
--- /dev/null
+++ b/plans/public/tier1-public.fmf
@@ -0,0 +1,7 @@
+Summary: Public Tier1 tests plan
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/wireshark.git
+    filter: 'tier: 1'
+execute:
+    how: tmt
diff --git a/plans/public/tier2-public.fmf b/plans/public/tier2-public.fmf
new file mode 100644
index 0000000..1c5a6f2
--- /dev/null
+++ b/plans/public/tier2-public.fmf
@@ -0,0 +1,7 @@
+Summary: Public Tier2 tests plan
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/wireshark.git
+    filter: 'tier: 2'
+execute:
+    how: tmt
diff --git a/plans/public/tier3-public.fmf b/plans/public/tier3-public.fmf
new file mode 100644
index 0000000..a0ebd05
--- /dev/null
+++ b/plans/public/tier3-public.fmf
@@ -0,0 +1,7 @@
+Summary: Public Tier3 tests plan
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/wireshark.git
+    filter: 'tier: 3'
+execute:
+    how: tmt