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 7cd5018..2019416 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -5,3 +5,5 @@ 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: osci.brew-build./plans/tier1-internal.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional}
diff --git a/plans/public.fmf b/plans/public.fmf
new file mode 100644
index 0000000..da57aee
--- /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/telnet.git
+execute:
+    how: tmt
+
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..64f46fc
--- /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/telnet
+execute:
+    how: tmt
+adjust:     
+    enabled: false     
+    when: distro == centos-stream-9
diff --git a/sources b/sources
index 6e5b87d..e55649c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d6beabaaf53fe6e382c42ce3faa05a36  netkit-telnet-0.17.tar.gz
-d74983062470c5a3e7ae14f34c489e00  telnet-client.tar.gz
+SHA512 (telnet-client.tar.gz) = 8609a420070f29c00dcf7d346863d1e0a4ee8c5ac9b20ea3bb91024acbdd5fe41e1be41d12b6f1eb96f9f1ed23a76175628856de7ac0ec4e7cabbaee6d0ee167
+SHA512 (netkit-telnet-0.17.tar.gz) = e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3