diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 84f1f3ccc..96e83009e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -6,8 +6,6 @@ steps:
 
   - label: ":docker: Image Builds"
     command: ".buildkite/steps/buildimages.sh | buildkite-agent pipeline upload"
-    agents:
-      build: "true"
     depends_on: ~
 
   - wait
diff --git a/.buildkite/steps/buildimages.sh b/.buildkite/steps/buildimages.sh
index 2c857e29a..91b4e21a3 100755
--- a/.buildkite/steps/buildimages.sh
+++ b/.buildkite/steps/buildimages.sh
@@ -6,6 +6,8 @@ do
   echo "  - label: \":docker: Build Image [${BUILD_ARCH}]\""
   echo "    commands:"
   echo "      - \"authelia-scripts docker build --arch=${BUILD_ARCH}\""
+  echo "    agents:"
+  echo "      build: \"true\""
   echo "    artifact_paths:"
   echo "      - \"authelia-image-${BUILD_ARCH}.tar.zst\""
   echo "      - \"authelia-linux-${BUILD_ARCH}.tar.gz\""