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 91f6f0f..71d105b 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,6 +1,25 @@
 --- !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/tier1-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/tier1-public.functional}
+
+#gating rhel
+--- !Policy
+product_versions:
+  - rhel-*
 decision_context: osci_compose_gate
 rules:
-    - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..bd0ae6b
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,35 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/synce4l.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/synce4l.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/synce4l.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/synce4l.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/synce4l.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/synce4l.git
+      name: /plans/others/public
diff --git a/tests/defconfig/runtest.sh b/tests/defconfig/runtest.sh
deleted file mode 100755
index a74d1b5..0000000
--- a/tests/defconfig/runtest.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-# Test if synce4l can parse default configuration
-
-set -ex
-
-# Find a nonexistent network device
-i=1
-while ip link show eth$i &> /dev/null; do
-	i=$((i + 1))
-done
-eth=eth$i
-
-tmpconf=$(mktemp)
-
-sed \
-	-e "s/^\[ens.*\]/\[eth$i\]/" \
-	-e "s|/run/synce4l_socket|/doesnotexist/synce4l_socket|" \
-	< /etc/synce4l.conf > "$tmpconf"
-
-out=$(timeout -s 9 5 synce4l -m -q -l 7 -f "$tmpconf" 2>&1 || :)
-
-echo "$out" | grep -q "created num_devices:"
-echo "$out" | grep -q "synce_manager_server_thread Bind failed"
-
-echo "unknownoption 1" >> "$tmpconf"
-
-out=$(timeout -s 9 5 synce4l -m -q -l 7 -f "$tmpconf" 2>&1 || :)
-
-echo "$out" | grep -q "failed to parse configuration file"
-
-rm "$tmpconf"
-
-exit 0
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 97de2fe..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    tests:
-    - defconfig
-    required_packages:
-    - iproute