diff --git a/ci.fmf b/ci.fmf
index 4609306..c5aa0e0 100644
--- a/ci.fmf
+++ b/ci.fmf
@@ -1,7 +1 @@
-summary: Upstreamed tier tests
-discover:
-    how: fmf
-    url: https://gitlab.com/redhat-crypto/tests/libssh.git
-    filter: 'tier: 0,1,2,3'
-execute:
-    how: tmt
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index 14e7c9c..b012e71 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -3,8 +3,8 @@ product_versions:
   - rhel-8
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.userspace-fips-mode.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build.revdeps.integration}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-disabled.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-enabled.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-enabled-buildroot-disabled.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-enabled-buildroot-enabled.functional}
diff --git a/plans/ci.fmf b/plans/ci.fmf
new file mode 100644
index 0000000..d8548e1
--- /dev/null
+++ b/plans/ci.fmf
@@ -0,0 +1,26 @@
+/fips-disabled-buildroot-disabled:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/libssh
+      name: /plans/ci/fips-disabled-buildroot-disabled
+
+
+/fips-disabled-buildroot-enabled:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/libssh
+      name: /plans/ci/fips-disabled-buildroot-enabled
+
+
+/fips-enabled-buildroot-disabled:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/libssh
+      name: /plans/ci/fips-enabled-buildroot-disabled
+
+
+/fips-enabled-buildroot-enabled:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/libssh
+      name: /plans/ci/fips-enabled-buildroot-enabled