diff --git a/ci.fmf b/ci.fmf
index 88beae7..da04079 100644
--- a/ci.fmf
+++ b/ci.fmf
@@ -1 +1,2 @@
-resultsdb-testcase: separate
\ No newline at end of file
+resultsdb-testcase: separate
+
diff --git a/gating.yaml b/gating.yaml
index 7da9094..120f6d6 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,7 +1,6 @@
-#gating rhel
 --- !Policy
 product_versions:
   - rhel-*
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/rhel-gating.functional}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..c5b5bd5
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,10 @@
+/rhel-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/mariadb
+      name: /plans/versioned/postgresql16/gating
+/rhel-no-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/mariadb
+      name: /plans/versioned/postgresql16/no-gating
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
deleted file mode 100644
index d2778fd..0000000
--- a/plans/tier1-internal.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: internal tier1 beakerlib tests
-discover:
-    how: fmf
-    url: https://pkgs.devel.redhat.com/git/tests/postgresql
-    filter: 'tier: 1'
-execute:
-    how: tmt