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..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 c190bde..ea3831d 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-*
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..ed57f9c
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,15 @@
+/tier1-internal:
+    discover:
+      - name: Internal gating tests (procps-ng)
+        how: fmf
+        url: https://gitlab.com/redhat/rhel/tests/procps-ng.git
+        filter: 'tier: 1'
+      - name: Internal gating tests (procps)
+        how: fmf
+        url: https://pkgs.devel.redhat.com/git/tests/procps/
+        filter: 'tier: 1'
+    execute:
+        how: tmt
+    adjust:
+        enabled: false
+        when: distro == centos-stream or distro == fedora