diff --git a/plans/bind9.16/others.fmf b/plans/bind9.16/others.fmf
index 444e3d3..e8bb7b2 100644
--- a/plans/bind9.16/others.fmf
+++ b/plans/bind9.16/others.fmf
@@ -1,6 +1,3 @@
-environment+:
-  PACKAGE: bind9.16
-
 /public:
   summary: Public other tests
   discover:
diff --git a/plans/bind9.16/tier1.fmf b/plans/bind9.16/tier1.fmf
index 4c1a8da..c3466ac 100644
--- a/plans/bind9.16/tier1.fmf
+++ b/plans/bind9.16/tier1.fmf
@@ -1,6 +1,3 @@
-environment+:
-  PACKAGE: bind9.16
-
 /public:
   summary: Public Tier1 tests
   discover:
diff --git a/plans/bind9.16/tier2-tier3.fmf b/plans/bind9.16/tier2-tier3.fmf
index 937c5b0..13fc758 100644
--- a/plans/bind9.16/tier2-tier3.fmf
+++ b/plans/bind9.16/tier2-tier3.fmf
@@ -1,6 +1,3 @@
-environment+:
-  PACKAGE: bind9.16
-
 /public:
   summary: Public Tier2 and Tier3 tests
   discover:
diff --git a/plans/bind9.18/tier1.fmf b/plans/bind9.18/tier1.fmf
index 5262540..7ece433 100644
--- a/plans/bind9.18/tier1.fmf
+++ b/plans/bind9.18/tier1.fmf
@@ -1,6 +1,3 @@
-environment+:
-  PACKAGE: bind9.18
-
 /public:
   summary: Public Tier1 tests
   discover:
@@ -11,9 +8,7 @@ environment+:
     how: tmt
   context:
     component: bind9.18
-  environment+:
-    PACKAGE: bind9.18
-  environment+:
+  environment:
     PACKAGE: bind9.18
 
 /internal:
@@ -29,5 +24,5 @@ environment+:
     how: tmt
   context:
     component: bind9.18
-  environment+:
+  environment:
     PACKAGE: bind9.18
diff --git a/plans/bind9.18/tier2-tier3.fmf b/plans/bind9.18/tier2-tier3.fmf
index fa3372f..df974e2 100644
--- a/plans/bind9.18/tier2-tier3.fmf
+++ b/plans/bind9.18/tier2-tier3.fmf
@@ -1,6 +1,3 @@
-environment+:
-  PACKAGE: bind9.18
-
 /public:
   summary: Public Tier2 and Tier3 tests
   discover: