diff --git a/gating.yaml b/gating.yaml
index 293f395..1fb3172 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,7 +1,10 @@
 --- !Policy
 product_versions:
   - fedora-*
-decision_context: bodhi_update_push_stable
+decision_contexts:
+  - bodhi_update_push_stable
+  - bodhi_update_push_testing
+subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
 
diff --git a/plans/conmon.fmf b/plans/conmon.fmf
deleted file mode 100644
index 60aa12b..0000000
--- a/plans/conmon.fmf
+++ /dev/null
@@ -1,27 +0,0 @@
----
-summary: Run conmon tests
-description: Test plan for conmon
-contact: Yuhui Jiang <yujiang@redhat.com>
-
-provision:
-  how: container
-
-prepare:
-  - name: Install packages
-    how: install
-    package: [crun, podman, podman-tests, git]
-  - name: Prepare bats
-    how: shell
-    script:
-      - rm -rf /tmp/bats-core-1.11.0
-      - curl -s -L https://github.com/bats-core/bats-core/archive/refs/tags/v1.11.0.tar.gz | tar xvz -C /tmp
-      - /tmp/bats-core-1.11.0/install.sh /usr
-
-discover:
-  how: fmf
-  filter: 'tag: gate'
-  url: https://gitlab.com/yujiang1/conmon.git
-  ref: c9s
-
-execute:
-  how: tmt
diff --git a/plans/podman.fmf b/plans/podman.fmf
new file mode 100644
index 0000000..0a65f31
--- /dev/null
+++ b/plans/podman.fmf
@@ -0,0 +1,43 @@
+prepare:
+    - name: packages
+      how: install
+      package: [bats, iptables, podman-tests]
+
+adjust:
+    - when: "initiator == packit"
+      because: "We need to test with updated packages from rhcontainerbot/podman-next copr"
+      prepare+:
+        how: shell
+        script: |
+            sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo
+            dnf -y upgrade --allowerasing
+    # FIXME: Use epel10 once bats is available there
+    - when: distro == centos-stream-10 or distro == rhel-10
+      because: "bats isn't yet available on epel10"
+      prepare+:
+        how: install
+        copr: rhcontainerbot/bats-el10
+        package: bats
+    - when: distro == centos-stream-9 or distro == rhel-9
+      because: "bats is present on EPEL on rhel9 / c9s"
+      prepare+:
+        how: feature
+        epel: enabled
+
+discover:
+    how: fmf
+    url: https://github.com/lsm5/podman
+    ref: "tmt-fedora-centos"
+
+execute:
+    how: tmt
+
+/system/local/root:
+    summary: Run podman system rootful tests
+    discover+:
+        filter: 'tag:local & tag:root'
+
+/system/local/rootless:
+    summary: Run podman system rootless tests
+    discover+:
+        filter: 'tag:local & tag:rootless'
diff --git a/tests/main.fmf b/tests/main.fmf
deleted file mode 100644
index cbb0ac2..0000000
--- a/tests/main.fmf
+++ /dev/null
@@ -1,14 +0,0 @@
----
-summary: conmon tests
-description: Using podman system tests to test conmon
-contact: Yuhui Jiang <yujiang@redhat.com>
-framework: shell
-require: [podman,conmon]
-
-tag: 'gate'
-
-test: |
-  /usr/bin/bats -t /usr/share/podman/test/system/030-run.bats
-  /usr/bin/bats -t /usr/share/podman/test/system/075-exec.bats
-
-duration: 15m