diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..08649f0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1,15 @@
+/e2e_ci:
+  plan:
+    import:
+      url: https://github.com/RedHat-SP-Security/fapolicyd-plans.git
+      name: /generic/e2e_ci
+
+#/package-update:
+#Need to be done
+
+/rpmverify:
+  plan:
+    import:
+      url: https://github.com/RedHat-SP-Security/fapolicyd-plans.git
+      name: /generic/rpmverify
+
diff --git a/plans/ci.fmf b/plans/ci.fmf
deleted file mode 100644
index 2b888c3..0000000
--- a/plans/ci.fmf
+++ /dev/null
@@ -1,12 +0,0 @@
-summary: FedoraCI test set
-discover:
-    how: fmf
-    url: https://github.com/RedHat-SP-Security/fapolicyd-tests.git
-    ref: master
-    filter: 'component: fapolicyd & tag: CI-Tier-1'
-execute:
-    how: tmt
-environment:
-    trigger: FedoraCI
-tag:
-  - FedoraCI