diff --git a/ci.fmf b/ci.fmf
index fa63c64..64e8db2 100644
--- a/ci.fmf
+++ b/ci.fmf
@@ -5,10 +5,7 @@
       - name: fedora
         how: fmf
         filter: "tag: Tier1,Tier2,Tier3 & distros: fedora"
-        repository: "https://src.fedoraproject.org/forks/odubaj/tests/cpio.git"
-    prepare:
-        how: ansible
-        playbooks:
-            ci/fedora-rawhide.yml
+        url: "https://src.fedoraproject.org/tests/cpio.git"
+        ref: master
     execute:
-        how: beakerlib
+        how: tmt
diff --git a/gating.yaml b/gating.yaml
index 97b0b56..ccc7aff 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -3,4 +3,4 @@ product_versions:
   - fedora-*
 decision_context: bodhi_update_push_stable
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.koji-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.koji-build.tier0.functional}
diff --git a/tests/tests.yml b/tests/tests.yml
index 638d673..be23e5c 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -8,7 +8,7 @@
   roles:
   - role: standard-test-beakerlib
     repositories:
-    - repo: https://src.fedoraproject.org/forks/odubaj/tests/cpio.git
+    - repo: https://src.fedoraproject.org/tests/cpio.git
       dest: cpio
       fmf_filter: "tag: Tier1,Tier2,Tier3"
     tags: