diff --git a/gating.yaml b/gating.yaml
index 7da9094..0a184d0 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,7 +1,26 @@
-#gating rhel
+# gating branched Fedora
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/gating-centos.functional}
+
+# gating Fedora 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/gating-centos.functional}
+
+# gating rhel
 --- !Policy
 product_versions:
   - rhel-*
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/gating-rhel.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/gating-centos.functional}
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
index 39ba722..0cbcc76 100644
--- a/plans/tier1-internal.fmf
+++ b/plans/tier1-internal.fmf
@@ -1,10 +1,10 @@
-summary: Internal Tier1 beakerlib tests
+summary: Internal Tier1 tests plan
 discover:
     how: fmf
-    url: https://gitlab.com/redhat/rhel/tests/valkey
-    filter: "tier:1"
+    url: https://pkgs.devel.redhat.com/git/tests/valkey
 execute:
     how: tmt
 adjust:
     enabled: false
-    when: distro == centos-stream-10
+    when: distro == centos-stream or distro == fedora
+    because: No access to internal git repositories
diff --git a/plans/tier1-public.fmf b/plans/tier1-public.fmf
new file mode 100644
index 0000000..c48b5c2
--- /dev/null
+++ b/plans/tier1-public.fmf
@@ -0,0 +1,7 @@
+summary: Public Tier1 tests plan
+discover:
+    how: fmf
+    url: https://gitlab.com/redhat/centos-stream/tests/valkey
+    filter: 'tag:-nogating'
+execute:
+    how: tmt