diff --git a/ci.fmf b/ci.fmf
deleted file mode 100644
index c5aa0e0..0000000
--- a/ci.fmf
+++ /dev/null
@@ -1 +0,0 @@
-resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index f4b9f11..034ef0d 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,8 +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/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/appstream.functional}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..8c96807
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,25 @@
+/public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/httpd.git
+      name: "/plans/all$"
+
+/appstream:
+  adjust:
+    - enabled: false
+      when: distro == centos-stream-10
+      because: "These tests should not run on CentOS Stream 10"
+  plan:
+    import:
+      url: https://gitlab.com/redhat/rhel/tests/httpd.git
+      name: "/plans/mod_md/appstream$"
+
+/crb:
+  adjust:
+    - enabled: false
+      when: distro == centos-stream-10
+      because: "These tests should not run on CentOS Stream 10"
+  plan:
+    import:
+      url: https://gitlab.com/redhat/rhel/tests/httpd.git
+      name: "/plans/mod_md/crb$"
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
deleted file mode 100644
index 43ecc7c..0000000
--- a/plans/tier1-internal.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Internal Tier1 beakerlib tests
-discover:
-    how: fmf
-    url: https://gitlab.com/redhat/rhel/tests/httpd
-    filter: "tier:1"
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream-10
diff --git a/plans/tier1-public.fmf b/plans/tier1-public.fmf
deleted file mode 100644
index 9ac90b0..0000000
--- a/plans/tier1-public.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Public (Fedora) Tier1 beakerlib tests
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/httpd
-    filter: 'tier: 1'
-execute:
-    how: tmt