diff --git a/.buildkite/release.yaml b/.buildkite/release.yaml
index c44a104c3..49a08c7e9 100644
--- a/.buildkite/release.yaml
+++ b/.buildkite/release.yaml
@@ -24,11 +24,13 @@ steps:
     if: build.branch == "master" && build.tag == null
     commands:
       - make ARCH=x86_64 push-all-images
+    agents:
+      arch: "amd64"
   - <<: *common
     label: ":ship: Push all images (aarch64)"
     if: build.branch == "master" && build.tag == null
     commands:
-      - make push-all-images
+      - make ARCH=aarch64 push-all-images
     agents:
       arch: "arm64"
   - <<: *common