diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2e927f7133a752851e2b575b18d3dda1fb4044d..e6be2880f3d81207eb541aa9f7aff329d09d66fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,12 +45,10 @@ qemu:
     CONFIG: local
     TARGET: //qemu/...
   tags:
-    - arm64
-    - linux
-    - metal
+    - fleet-automated
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
+    - if: $CI_COMMIT_BRANCH 
+    - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_request"
 
 oci:
   stage: .pre