diff --git a/.buildkite/steps/buildimages.sh b/.buildkite/steps/buildimages.sh
index 4300a9d28..9094ec87f 100755
--- a/.buildkite/steps/buildimages.sh
+++ b/.buildkite/steps/buildimages.sh
@@ -18,7 +18,7 @@ EOF
 fi
 cat << EOF
     agents:
-      build: "true"
+      build: "${BUILD_OS}-${BUILD_ARCH}"
     artifact_paths:
 EOF
 if [[ "${BUILD_OS}" == "linux" ]]; then