diff --git a/build-pipeline.yml b/build-pipeline.yml
index a1a12b068d2ccd2bb207420fc46898fd70fd99fb..47edd008e18658ebec3ab5098e71a67f6ad54e80 100644
--- a/build-pipeline.yml
+++ b/build-pipeline.yml
@@ -190,7 +190,7 @@ workflow:
 .buildbase:
   stage: Build
   tags:
-    - builds
+    - ${BUILD_RUNNER_TAG}
   timeout: 8h
   interruptible: true
   image:
@@ -205,6 +205,7 @@ workflow:
       - "/usr/bin/poky-entry.py"
       - "--id=118:998"
   variables:
+    BUILD_RUNNER_TAG: "builds"
     MANUAL_BUILD: "false"
     MANIFEST_FILE: "default.xml"
   rules: