diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.vim.metadata b/.vim.metadata
new file mode 100644
index 00000000..4c3a9d8d
--- /dev/null
+++ b/.vim.metadata
@@ -0,0 +1 @@
+8405efdee1d83465651f90edc1173ff69f390aea vim-8.2-2637.tar.bz2
diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 00000000..c5aa0e08
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index e9798625..daad873f 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,8 +1,28 @@
 --- !Policy
 product_versions:
-    - rhel-9
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional}
+
+#Rawhide
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional}
+
+#gating rhel
+--- !Policy
+product_versions:
+  - rhel-*
 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: 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}
diff --git a/plans/public.fmf b/plans/public.fmf
new file mode 100644
index 00000000..880a0d4c
--- /dev/null
+++ b/plans/public.fmf
@@ -0,0 +1,6 @@
+summary: Test plan with all Fedora tests
+discover:
+       how: fmf
+       url: https://src.fedoraproject.org/tests/vim.git
+execute:
+       how: tmt
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 00000000..ebe4da6a
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,12 @@
+summary: CI plan, picks internal Tier1 tests, runs in beakerlib.
+discover:
+  - name: rhel
+    how: fmf
+    filter: 'tier: 1'
+    url: git://pkgs.devel.redhat.com/tests/vim
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora
+    because: They don't have access to internal repos.