diff --git a/gating.yaml b/gating.yaml
index 1d65cc1..27ba783 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,22 +1,7 @@
 --- !Policy
 product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/fedora_tests.functional}
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/fedora_tests.functional}
---- !Policy
-product_versions:
-  - rhel-*
+  - rhel-10
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.ci-beaker.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/tier1.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/tier1-custom-hw.functional}
diff --git a/plans/ci.fmf b/plans/ci.fmf
new file mode 100644
index 0000000..b2a25f8
--- /dev/null
+++ b/plans/ci.fmf
@@ -0,0 +1,12 @@
+summary: CI test plan
+/tier1:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/openscap
+      name: /plans/gating/tier1
+
+/tier1-custom-hw:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/openscap
+      name: /plans/gating/tier1-custom-hw
diff --git a/plans/fedora_tests.fmf b/plans/fedora_tests.fmf
deleted file mode 100644
index b077636..0000000
--- a/plans/fedora_tests.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: Run tests from openscap tests repository
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/openscap
-execute:
-    how: tmt