diff --git a/.buildkite/pipeline.elastic-agent-package.yml b/.buildkite/pipeline.elastic-agent-package.yml
index 21da091a482..df56b692413 100644
--- a/.buildkite/pipeline.elastic-agent-package.yml
+++ b/.buildkite/pipeline.elastic-agent-package.yml
@@ -51,9 +51,8 @@ steps:
   - label: ":package: Package elastic-agent"
     key: package_elastic-agent
     agents:
-      provider: "gcp"
-      image: "ubuntu-2204-lts-arm64"
-      machineType: "t2a-standard-8"
+      provider: "aws"
+      image: "core-ubuntu-2204-aarch64"
     command: |
       if [[ -z "${DEV}" ]]; then
         export DEV=$(buildkite-agent meta-data get DEV --default "true")