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/.libedit.metadata b/.libedit.metadata
new file mode 100644
index 0000000..92310a5
--- /dev/null
+++ b/.libedit.metadata
@@ -0,0 +1 @@
+343e3e0325b90c9be15f31734001c9dac5a1f179 libedit-20210216-3.1.tar.gz
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 e979862..a2f17d6 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,8 +1,11 @@
 --- !Policy
 product_versions:
-    - rhel-9
+  - rhel-9
 decision_context: osci_compose_gate
 rules:
-    - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-    - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
-    - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier2.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier3.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
diff --git a/plans/public.fmf b/plans/public.fmf
new file mode 100644
index 0000000..cc93288
--- /dev/null
+++ b/plans/public.fmf
@@ -0,0 +1,7 @@
+summary: Test plan that runs all tests from tests repo.
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/libedit.git
+execute:
+    how: tmt
+
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..d86f8f4
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,11 @@
+summary: CI plan, picks Tier1 tests, runs in beakerlib.
+discover:
+  - name: rhel
+    how: fmf
+    filter: 'tier: 1'
+    url: git://pkgs.devel.redhat.com/tests/libedit
+execute:
+    how: tmt
+adjust:     
+    enabled: false     
+    when: distro == centos-stream-9