diff --git a/queries/1286818.yaml b/queries/1286818.yaml
index 880d8a1a..132c386a 100644
--- a/queries/1286818.yaml
+++ b/queries/1286818.yaml
@@ -1,4 +1,4 @@
 query: >
   message:"E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?"
-  AND NOT build_name:check-tripleo*
+  AND NOT (build_queue:check-tripleo OR build_queue:experimental-tripleo)
   AND tags:"console"
diff --git a/queries/1299176.yaml b/queries/1299176.yaml
index 6bec4dc8..e63558e6 100644
--- a/queries/1299176.yaml
+++ b/queries/1299176.yaml
@@ -1,6 +1,6 @@
 query: >
   tags:console
-  AND NOT build_queue:check-tripleo
+  AND NOT (build_queue:check-tripleo OR build_queue:experimental-tripleo)
   AND
   (message:"couldn't connect to host"
   OR
diff --git a/queries/1324359.yaml b/queries/1324359.yaml
index 0e612ad5..3d81fa5d 100644
--- a/queries/1324359.yaml
+++ b/queries/1324359.yaml
@@ -1,3 +1,3 @@
 query: >
   message:"Error communicating with" AND message:"timed out" AND
-  build_queue:"check-tripleo"
+  (build_queue:check-tripleo OR build_queue:experimental-tripleo)