diff --git a/gating.yaml b/gating.yaml
index 9da38fe..d1bd7eb 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -3,10 +3,8 @@ product_versions:
   - rhel-10
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-tier1.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-tier2.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-explicitCI.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-enabled-tier1.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-enabled-tier2.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-enabled-explicitCI.functional}
-  # - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
\ No newline at end of file
+  - !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}
+  # - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
diff --git a/plans/ci.fmf b/plans/ci.fmf
index bdb273c..5d398f4 100644
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@@ -1,40 +1,26 @@
-/fips-disabled-tier1:
+/fips-disabled-buildroot-disabled:
   plan:
     import:
       url: https://pkgs.devel.redhat.com/git/tests/openssl
-      name: /Plans/ci/fips-disabled-tier1
+      name: /Plans/ci/fips-disabled-buildroot-disabled
 
 
-/fips-disabled-tier2:
+/fips-disabled-buildroot-enabled:
   plan:
     import:
       url: https://pkgs.devel.redhat.com/git/tests/openssl
-      name: /Plans/ci/fips-disabled-tier2
+      name: /Plans/ci/fips-disabled-buildroot-enabled
 
 
-/fips-disabled-explicitCI:
+/fips-enabled-buildroot-disabled:
   plan:
     import:
       url: https://pkgs.devel.redhat.com/git/tests/openssl
-      name: /Plans/ci/fips-disabled-explicitCI
+      name: /Plans/ci/fips-enabled-buildroot-disabled
 
 
-/fips-enabled-tier1:
+/fips-enabled-buildroot-enabled:
   plan:
     import:
       url: https://pkgs.devel.redhat.com/git/tests/openssl
-      name: /Plans/ci/fips-enabled-tier1
-
-
-/fips-enabled-tier2:
-  plan:
-    import:
-      url: https://pkgs.devel.redhat.com/git/tests/openssl
-      name: /Plans/ci/fips-enabled-tier2
-
-
-/fips-enabled-explicitCI:
-  plan:
-    import:
-      url: https://pkgs.devel.redhat.com/git/tests/openssl
-      name: /Plans/ci/fips-enabled-explicitCI
+      name: /Plans/ci/fips-enabled-buildroot-enabled