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/gating.yaml b/gating.yaml
index dfc23d3..a6a37c3 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,6 +1,14 @@
-# recipients: jnovy, lsm5, santiago
 --- !Policy
 product_versions:
-  - rhel-9
+  - fedora-*
+decision_context: bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+--- !Policy
+product_versions:
+  - rhel-*
 decision_context: osci_compose_gate
-rules: []
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+
diff --git a/plans/containers-common.fmf b/plans/containers-common.fmf
new file mode 100644
index 0000000..c60fa4f
--- /dev/null
+++ b/plans/containers-common.fmf
@@ -0,0 +1,27 @@
+---
+summary: Run containers-common tests
+description: Test plan for containers-common
+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/containers-common.git
+  ref: c9s
+
+execute:
+  how: tmt
diff --git a/tests/main.fmf b/tests/main.fmf
new file mode 100644
index 0000000..9880105
--- /dev/null
+++ b/tests/main.fmf
@@ -0,0 +1,14 @@
+---
+summary: containers-common tests
+description: Using podman system tests to test containers-common
+contact: Yuhui Jiang <yujiang@redhat.com>
+framework: shell
+require: [podman,containers-common]
+
+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