diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 89760b24e6..c375c97309 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -119,7 +119,7 @@
           && $CI_COMMIT_REF_PROTECTED == "true"
       when: on_success
   tags:
-    - xilinx
+    - xilinx-zynq-423
 
 .xilinx-x86_64:
   extends: .test-jobs-common
@@ -139,7 +139,7 @@
           && $CI_COMMIT_REF_PROTECTED == "true"
       when: on_success
   tags:
-    - xilinx
+    - xilinx-crater-001
 
 .adl-x86-64:
   extends: .test-jobs-common