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 7aacbb2..7a84520 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -3,6 +3,4 @@ product_versions:
   - rhel-8
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
-
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..73ecd13
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,27 @@
+summary: Internal gating tests plan
+discover:
+  - name: Internal gating tests plan (bash)
+    how: fmf
+    filter: 'tag: CI-Tier-1 & component: ksh'
+    url: https://pkgs.devel.redhat.com/git/tests/bash
+  - name: Internal gating tests plan (dash)
+    how: fmf
+    filter: 'tag: CI-Tier-1 & component: ksh'
+    url: https://pkgs.devel.redhat.com/git/tests/dash
+  - name: Internal gating tests plan (ksh)
+    how: fmf
+    filter: 'tag: CI-Tier-1 & component: ksh'
+    url: https://pkgs.devel.redhat.com/git/tests/ksh
+  - name: Internal gating tests plan (mksh)
+    how: fmf
+    filter: 'tag: CI-Tier-1 & component: ksh'
+    url: https://pkgs.devel.redhat.com/git/tests/mksh
+  - name: Internal gating tests plan (zsh)
+    how: fmf
+    filter: 'tag: CI-Tier-1 & component: ksh'
+    url: https://pkgs.devel.redhat.com/git/tests/zsh
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index e483864..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-
-# Tests that run in classic context
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/shell.git"
-      dest: "shell"
-      fmf_filter: "tier: 1, 2 & tags: classic"
-    environment:
-      PACKAGES: ksh
-      SH_BIN: ksh
-    required_packages:
-    - ksh
-    - expect            # login requires expect
-    - which             # smoke requires which
-
-# Tests that run in container
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - container
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/shell.git"
-      dest: "shell"
-      fmf_filter: "tier: 1, 2 & tags: container, atomic"
-    environment:
-      PACKAGES: ksh
-      SH_BIN: ksh
-    required_packages:
-    - ksh
-    - which             # smoke requires which