diff --git a/ci.fmf b/ci.fmf
index fdcac15..c5aa0e0 100644
--- a/ci.fmf
+++ b/ci.fmf
@@ -1,13 +1 @@
-/test:
-    summary:
-        CI plan, picks Tier1 tests, runs in beakerlib.
-    description:
-        This special plan has to be named ci.fmf to run in CI.
-        It selects test which have 'tier 1' in their main.fmf file
-    discover:
-      - name: tier1
-        how: fmf
-        filter: 'tier: 1'
-        repository: "https://src.fedoraproject.org/tests/ftp.git"
-    execute:
-        how: tmt
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index 5923021..a2f17d6 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -3,6 +3,8 @@ product_versions:
   - rhel-9
 decision_context: osci_compose_gate
 rules:
+  - !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: baseos-ci.brew-build.tier1.functional}
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier2.functional}
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier3.functional}
diff --git a/plans/public.fmf b/plans/public.fmf
new file mode 100644
index 0000000..a87b61a
--- /dev/null
+++ b/plans/public.fmf
@@ -0,0 +1,7 @@
+summary: Test plan that runs all tests from tests repo.
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/ftp.git
+execute:
+    how: tmt
+
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..86fe819
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,11 @@
+summary: CI plan, picks Tier1 tests, runs in beakerlib.
+discover:
+  - name: rhel
+    how: fmf
+    filter: 'tier: 1'
+    url: git://pkgs.devel.redhat.com/tests/ftp
+execute:
+    how: tmt
+adjust:     
+    enabled: false     
+    when: distro == centos-stream-9