diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index e0a3a8f..2fb6568 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,7 +1,7 @@
+# Gating rhel
 --- !Policy
 product_versions:
   - rhel-10
 decision_context: osci_compose_gate
 rules:
-#  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-gating.functional}
diff --git a/plans/tier1-gating.fmf b/plans/tier1-gating.fmf
new file mode 100644
index 0000000..a2b1f44
--- /dev/null
+++ b/plans/tier1-gating.fmf
@@ -0,0 +1,10 @@
+summary: Internal Tier1-gating beakerlib tests
+discover:
+    how: fmf
+    url: git://pkgs.devel.redhat.com/tests/iptables
+    filter: 'tag: CI-gating & tag: -destructive'
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora