diff --git a/.gitlab/docker_common/publish_job_templates.yml b/.gitlab/docker_common/publish_job_templates.yml
index 144e9ce5416aa..122dc90cfdb33 100644
--- a/.gitlab/docker_common/publish_job_templates.yml
+++ b/.gitlab/docker_common/publish_job_templates.yml
@@ -6,7 +6,7 @@
 
 .docker_publish_job_definition:
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
-  tags: ["runner:main"]
+  tags: ["arch:amd64"]
   variables:
     <<: *docker_variables
     IMG_VARIABLES: ""