diff --git a/roles/copr/frontend/templates/copr.conf b/roles/copr/frontend/templates/copr.conf
index 149db6edef..98360272fd 100644
--- a/roles/copr/frontend/templates/copr.conf
+++ b/roles/copr/frontend/templates/copr.conf
@@ -184,19 +184,19 @@ EXTRA_BUILDCHROOT_TAGS = [{
     "pattern": "@copr/powerful-test/fedora-rawhide-(x86_64|aarch64)/.*",
     "tags": ["on_demand_powerful"],
 }, {
-    "pattern": "@copr/measure-hypervisor/.*x86_64/.*",
+    "pattern": "@copr/measure-hypervisor.*/.*x86_64/.*",
     "tags": ["hypervisor"],
 }, {
-    "pattern": "@copr/measure-hypervisor/.*ppc64le/.*",
+    "pattern": "@copr/measure-hypervisor.*/.*ppc64le/.*",
     "tags": ["hypervisor", "arch_power9"],
 }, {
-    "pattern": "@copr/measure-aws/.*/.*",
+    "pattern": "@copr/measure-aws.*/.*/.*",
     "tags": ["aws"],
 }, {
-    "pattern": "@copr/measure-aws-powerful/.*/.*",
-    "tags": ["aws", "on_demand_powerful"],
+    "pattern": "@copr/measure-aws-powerful.*/.*/.*",
+    "tags": ["on_demand_powerful"],
 }, {
-    "pattern": "@copr/measure-hv-p08/.*/.*",
+    "pattern": "@copr/measure-hv-p08.*/.*/.*",
     "tags": ["arch_power8"],
 }]
 {% endif %}