diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 5ce445b78f..0a2b80956b 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -118,7 +118,7 @@
       when: never
     - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true"
   tags:
-    - xilinx
+    - xilinx-zynq-423
 
 .xilinx-x86_64:
   extends: .test-jobs-common
@@ -139,7 +139,7 @@
       when: never
     - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true"
   tags:
-    - xilinx
+    - xilinx-crater-001
 
 .adl-x86-64:
   extends: .test-jobs-common