diff --git a/ci.fmf b/ci.fmf
index 64e8db2..c5aa0e0 100644
--- a/ci.fmf
+++ b/ci.fmf
@@ -1,11 +1 @@
-/test:
-    summary:
-        Basic set of quick tests for cpio.
-    discover:
-      - name: fedora
-        how: fmf
-        filter: "tag: Tier1,Tier2,Tier3 & distros: fedora"
-        url: "https://src.fedoraproject.org/tests/cpio.git"
-        ref: master
-    execute:
-        how: tmt
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index c2182c7..d9d641e 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
+  - rhel-10
+decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.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..3284b10
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,11 @@
+summary: Internal gating tests plan
+discover:
+  - name: Internal gating tests
+    how: fmf
+    filter: 'tag: Tier1,Tier2,Tier3'
+    url: https://pkgs.devel.redhat.com/git/tests/cpio
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora