diff --git a/gating.yaml b/gating.yaml
index fb11fa9..2fab6b7 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -21,7 +21,6 @@ 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.tier2.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier3.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier2-internal.functional}
diff --git a/plans/all.fmf b/plans/all.fmf
deleted file mode 100644
index e98ae64..0000000
--- a/plans/all.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: Test plan with all beakerlib tests
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/httpd.git
-execute:
-    how: tmt
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..62bfc6f
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,10 @@
+summary: Internal Tier1 beakerlib tests
+discover:
+    how: fmf
+    url: git@gitlab.com:redhat/rhel/tests/httpd.git
+    filter: 'tier: 1'
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream-10
diff --git a/plans/tier2-internal.fmf b/plans/tier2-internal.fmf
new file mode 100644
index 0000000..88d679d
--- /dev/null
+++ b/plans/tier2-internal.fmf
@@ -0,0 +1,10 @@
+summary: Internal Tier2 beakerlib tests
+discover:
+    how: fmf
+    url: git@gitlab.com:redhat/rhel/tests/httpd.git
+    filter: 'tier: 2'
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream-10