diff --git a/ci.fmf b/ci.fmf
index 92c9b2d..c5aa0e0 100644
--- a/ci.fmf
+++ b/ci.fmf
@@ -1,8 +1 @@
-summary: Tier tests
-discover:
-    how: fmf
-    repository: https://github.com/hhorak/generic-tests.git
-    ref: main
-    filter: 'tag:build_requires_libarchive'
-execute:
-    how: tmt
+resultsdb-testcase: separate
diff --git a/plans/internal.fmf b/plans/internal.fmf
new file mode 100644
index 0000000..4833503
--- /dev/null
+++ b/plans/internal.fmf
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000..aa79498
--- /dev/null
+++ b/plans/public.fmf
@@ -0,0 +1,7 @@
+summary: Public (Gitlab) beakerlib tests
+discover:
+  - name: gitlab
+    how: fmf
+    url: https://gitlab.com/redhat/centos-stream/tests/libarchive.git
+execute:
+    how: tmt