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 2cf8f26..d5562d9 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -5,3 +5,4 @@ decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional}
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.ci-dnf-stack-gating.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/internal/CI-Tier-1.functional}
diff --git a/plans/internal/CI-Tier-1.fmf b/plans/internal/CI-Tier-1.fmf
new file mode 100644
index 0000000..3139541
--- /dev/null
+++ b/plans/internal/CI-Tier-1.fmf
@@ -0,0 +1,24 @@
+summary: Internal CI-Tier-1 tests plan
+discover:
+  - name: dnf-plugins-core
+    how: fmf
+    filter: 'tag: CI-Tier-1'
+    url: https://pkgs.devel.redhat.com/git/tests/dnf-plugins-core
+  - name: dnf-upstream-test-suite in dnf
+    how: fmf
+    url: https://pkgs.devel.redhat.com/git/tests/dnf
+    test:
+      - /Sanity/run-upstream-tests-on-rhel/TC#0570162
+  - name: dnf-plugins-core tests in dnf
+    how: fmf
+    filter: 'tag: CI-Tier-1 & component: dnf-plugins-core'
+    url: https://pkgs.devel.redhat.com/git/tests/dnf
+  - name: yum-utils
+    how: fmf
+    filter: 'tag: CI-Tier-1'
+    url: https://pkgs.devel.redhat.com/git/tests/yum-utils
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora