diff --git a/plans.fmf b/plans.fmf
index a945b17..8296a08 100644
--- a/plans.fmf
+++ b/plans.fmf
@@ -5,54 +5,36 @@ environment+:
   plan:
     import:
       url: https://src.fedoraproject.org/tests/bind.git
-      name: /plans/tier1/internal
+      name: /plans/bind9.18/tier1/internal
 
 /tier1-public:
-  # import does not propagate context changes!
-  #plan:
-  #  import:
-  #    url: https://src.fedoraproject.org/tests/bind.git
-  #    name: /plans/tier1/public
-  summary: Public (Fedora) Tier1 beakerlib tests
-  discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/bind.git
-    filter: 'tier: 1'
-  execute:
-    how: tmt
-  context:
-    component: bind9.18
+   import does not propagate context changes!
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/bind.git
+      name: /plans/bind9.18/tier1/public
+
 
 /tier2-tier3-internal:
   plan:
     import:
       url: https://src.fedoraproject.org/tests/bind.git
-      name: /plans/tier2-tier3/internal
+      name: /plans/bind9.18/tier2-tier3/internal
 
 /tier2-tier3-public:
-  #plan:
-  #  import:
-  #    url: https://src.fedoraproject.org/tests/bind.git
-  #    name: /plans/tier2-tier3/public
-  # context propagation does not work that way!
-  summary: Public (Fedora) Tier2+3 beakerlib tests
-  discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/bind.git
-    filter: 'tier: 2 | tier: 3'
-  execute:
-    how: tmt
-  context:
-    component: bind9.18
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/bind.git
+      name: /plans/bind9.18/tier2-tier3/public
 
 /others-internal:
   plan:
     import:
       url: https://src.fedoraproject.org/tests/bind.git
-      name: /plans/others/internal
+      name: /plans/bind9.18/others/internal
 
 /others-public:
   plan:
     import:
       url: https://src.fedoraproject.org/tests/bind.git
-      name: /plans/others/public
+      name: /plans/bind9.18/others/public