diff --git a/gating.yaml b/gating.yaml
index 9587366..106b1d4 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -4,7 +4,6 @@ product_versions:
   - rhel-10
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-gating.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-gating-heavy.functional}
-  # - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/destructive.functional}
-  # - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/downstream.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/upstream.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/upstream-integration.functional}
diff --git a/plans/tier2-internal.fmf b/plans/downstream.fmf
similarity index 74%
rename from plans/tier2-internal.fmf
rename to plans/downstream.fmf
index 3e1d7d3..aa09552 100644
--- a/plans/tier2-internal.fmf
+++ b/plans/downstream.fmf
@@ -1,8 +1,8 @@
-summary: Internal Tier2 beakerlib tests
+summary: Downstream Tests
 discover:
     how: fmf
     url: git://pkgs.devel.redhat.com/tests/firewalld
-    filter: 'tier: 2'
+    filter: 'tag: -upstream'
 execute:
     how: tmt
 adjust:
diff --git a/plans/tier1-gating-heavy.fmf b/plans/tier1-gating-heavy.fmf
deleted file mode 100644
index f4a4c21..0000000
--- a/plans/tier1-gating-heavy.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Internal Tier1-gating-heavy plan
-discover:
-    how: fmf
-    url: git://pkgs.devel.redhat.com/tests/firewalld
-    filter: 'tag: CI-gating & tag: heavy & tag: -destructive'
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora
diff --git a/plans/tier1-gating.fmf b/plans/upstream-integration.fmf
similarity index 64%
rename from plans/tier1-gating.fmf
rename to plans/upstream-integration.fmf
index 566420e..b75bdcb 100644
--- a/plans/tier1-gating.fmf
+++ b/plans/upstream-integration.fmf
@@ -1,8 +1,8 @@
-summary: Internal Tier1-gating plan
+summary: Upstream Integration Testsuite
 discover:
     how: fmf
     url: git://pkgs.devel.redhat.com/tests/firewalld
-    filter: 'tag: CI-gating & tag: -heavy & tag: -destructive'
+    filter: 'tag: upstream & tag: integration'
 execute:
     how: tmt
 adjust:
diff --git a/plans/destructive.fmf b/plans/upstream.fmf
similarity index 70%
rename from plans/destructive.fmf
rename to plans/upstream.fmf
index 1e4ce7b..97416e7 100644
--- a/plans/destructive.fmf
+++ b/plans/upstream.fmf
@@ -1,8 +1,8 @@
-summary: Internal Tier1 beakerlib tests
+summary: Upstream Testsuite
 discover:
     how: fmf
     url: git://pkgs.devel.redhat.com/tests/firewalld
-    filter: 'tag: destructive'
+    filter: 'tag: upstream & tag: -integration'
 execute:
     how: tmt
 adjust: