diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..3841cb6
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1,18 @@
+---
+resultsdb-testcase: separate
+
+/gating/public:
+  plan:
+    import:
+      name: /plans/gating
+      url: https://gitlab.com/redhat/centos-stream/tests/HdrHistogram_c.git
+
+/gating/private:
+  enabled: false
+  adjust:
+    - when: distro == rhel
+      enabled: true
+  plan:
+    import:
+      name: /plans/gating
+      url: https://gitlab.cee.redhat.com/toolchain-qe/tests/HdrHistogram_c.git
diff --git a/gating.yaml b/gating.yaml
index daffe28..e1561e1 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,9 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-*
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-tmt-aarch64.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-tmt-ppc64le.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-tmt-s390x.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-tmt-x86_64.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./ci/gating.functional}
diff --git a/plans/gating.fmf b/plans/gating.fmf
deleted file mode 100644
index 5ed0c31..0000000
--- a/plans/gating.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: CI Gating Plan
-discover:
-    how: fmf
-    filter: tag:gating
-execute:
-    how: tmt