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 0894ced..2f82c6d 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,6 +1,11 @@
 --- !Policy
 product_versions:
-        - rhel-8
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
-        - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/rhel-postgresql96-gating.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/rhel-postgresql10-gating.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/rhel-postgresql12-gating.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/rhel-postgresql13-gating.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/rhel-postgresql15-gating.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/rhel-postgresql16-gating.functional}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..c5b4a64
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,65 @@
+/rhel-postgresql96-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/postgresql
+      name: /plans/modular/postgresql96/gating
+/rhel-postgresql96-no-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/postgresql
+      name: /plans/modular/postgresql96/no-gating
+
+/rhel-postgresql10-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/postgresql
+      name: /plans/modular/postgresql10/gating
+/rhel-postgresql-10-no-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/postgresql
+      name: /plans/modular/postgresql10/no-gating
+
+/rhel-postgresql12-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/postgresql
+      name: /plans/modular/postgresql12/gating
+/rhel-postgresql-12-no-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/postgresql
+      name: /plans/modular/postgresql12/no-gating
+
+/rhel-postgresql13-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/postgresql
+      name: /plans/modular/postgresql13/gating
+/rhel-postgresql-13-no-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/postgresql
+      name: /plans/modular/postgresql13/no-gating
+
+/rhel-postgresql15-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/postgresql
+      name: /plans/modular/postgresql15/gating
+/rhel-postgresql-15-no-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/postgresql
+      name: /plans/modular/postgresql15/no-gating
+
+/rhel-postgresql16-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/postgresql
+      name: /plans/modular/postgresql16/gating
+/rhel-postgresql-16-no-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/postgresql
+      name: /plans/modular/postgresql16/no-gating