diff --git a/plans.fmf b/plans.fmf
index 9b302b4..a945b17 100644
--- a/plans.fmf
+++ b/plans.fmf
@@ -1,3 +1,6 @@
+environment+:
+  PACKAGE: bind9.18
+
 /tier1-internal:
   plan:
     import:
@@ -5,10 +8,20 @@
       name: /plans/tier1/internal
 
 /tier1-public:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/bind.git
-      name: /plans/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
 
 /tier2-tier3-internal:
   plan:
@@ -17,10 +30,20 @@
       name: /plans/tier2-tier3/internal
 
 /tier2-tier3-public:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/bind.git
-      name: /plans/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
 
 /others-internal:
   plan: