diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index eba5f18b8..7de1373ee 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -191,7 +191,7 @@ steps:
     label: ":docker: Images (aarch64)"
     command: make ARCH=aarch64 load-all-images
     agents:
-      arch: "amd64"
+      arch: "arm64"
 
   # Basic unit tests.
   - <<: *common
diff --git a/images/syzkaller/Dockerfile b/images/syzkaller/Dockerfile
index 9f739d972..2b2755a70 100644
--- a/images/syzkaller/Dockerfile
+++ b/images/syzkaller/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/syzkaller/env
+FROM gcr.io/syzkaller/syzbot
 
 # This image is mostly for investigating syzkaller crashes, so let's install
 # developer tools.