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 6dc3e3a..3c35f7d 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,7 +1,25 @@
 --- !Policy
 product_versions:
-    - rhel-*
+  - 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.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 0000000..b7e7975
--- /dev/null
+++ b/plans/public.fmf
@@ -0,0 +1,6 @@
+summary: Test plan that runs all tests from cups tests repo.
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/system-config-printer.git
+execute:
+    how: tmt
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..07c5dcd
--- /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/system-config-printer
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora
+    because: They don't have access to internal repos.
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 596e6d0..4e91134 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -9,7 +9,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.5.18
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL-2.0-or-later
 URL: https://github.com/%{username}/%{name}
 Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
@@ -295,6 +295,9 @@ exit 0
 %endif
 
 %changelog
+* Fri May 17 2024 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.18-9
+- adjust gating.yaml and build it to pass gating...
+
 * Wed Mar 20 2024 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.18-8
 - RHEL-28165 - configure-printer exits with failure status when device is already handled
 - RHEL-26328 - Drop the dependency on python3-pycurl