diff --git a/gating.yaml b/gating.yaml
index dbde1aa..9a53747 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -23,5 +23,5 @@ product_versions:
   - rhel-*
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/internal.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/gating-centos.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/gating-rhel.functional}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..23f88d2
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,10 @@
+/gating-centos:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/libarchive.git
+      name: /plans/gating
+/gating-rhel:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/rhel/tests/libarchive.git
+      name: /plans/gating
diff --git a/plans/internal.fmf b/plans/internal.fmf
deleted file mode 100644
index 4833503..0000000
--- a/plans/internal.fmf
+++ /dev/null
@@ -1,16 +0,0 @@
-summary: Private (RHEL) beakerlib tests
-enabled: false
-adjust:
-  - when: distro == rhel
-    enabled: true
-    because: private tests are accesible only within rhel pipline
-discover:
-  - name: rhel-libarchive
-    how: fmf
-    url: git://pkgs.devel.redhat.com/tests/libarchive
-  - name: distribution
-    how: fmf
-    url: git://pkgs.devel.redhat.com/tests/distribution
-    test: /install/rhel-buildroot
-execute:
-    how: tmt
diff --git a/plans/public.fmf b/plans/public.fmf
deleted file mode 100644
index a683043..0000000
--- a/plans/public.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Public (Gitlab) beakerlib tests
-discover:
-  - name: gitlab
-    how: fmf
-    url: https://gitlab.com/redhat/centos-stream/tests/libarchive.git
-execute:
-    how: tmt
-provision:
-    hardware:
-      memory: ">= 6 GB"