diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..da71d9f
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1,2 @@
+# Docs: https://docs.fedoraproject.org/en-US/ci/tmt/#_multiple_plans
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index 0bd5927..25cfcb0 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,14 +1,7 @@
 --- !Policy
 product_versions:
-  - fedora-*
-decision_context: 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}
---- !Policy
-product_versions:
-  - fedora-*
-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: osci.brew-build./plans/file-CI-plan.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..6b63572
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,11 @@
+summary: Internal Tier 1 tests
+
+discover:
+    how: fmf
+    url: https://pkgs.devel.redhat.com/git/tests/file
+    filter: 'tier: 1 | tag: CI-Tier-1'
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora