diff --git a/.buildkite/pipeline.elastic-agent-package.yml b/.buildkite/pipeline.elastic-agent-package.yml
index 9aef30c515f..79dd67421e9 100644
--- a/.buildkite/pipeline.elastic-agent-package.yml
+++ b/.buildkite/pipeline.elastic-agent-package.yml
@@ -79,11 +79,14 @@ steps:
         agents:
           provider: "aws"
           instanceType: "t4g.2xlarge"
-          imagePrefix: "core-ubuntu-2004-aarch64"
+          imagePrefix: "core-ubuntu-2204-aarch64"
         env:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
         command: |
+          echo "Add support for multiarch"
+          docker run --privileged --rm tonistiigi/binfmt:master --install all
+
           if [[ -z "$${MANIFEST_URL}" ]]; then
             export MANIFEST_URL=$(buildkite-agent meta-data get MANIFEST_URL --default "")
             if [[ -z "$${MANIFEST_URL}" ]]; then
@@ -110,10 +113,10 @@ steps:
       DRA_PROJECT_ARTIFACT_ID: "agent-package"
     command: |
       echo "+++ Restoring Artifacts"
-      buildkite-agent artifact download "build/**/*" . 
+      buildkite-agent artifact download "build/**/*" .
 
-      echo "+++ Changing permissions for the release manager"      
-      sudo chmod -R a+r build/distributions/ 
+      echo "+++ Changing permissions for the release manager"
+      sudo chmod -R a+r build/distributions/
       sudo chown -R :1000 build/distributions/
       ls -lahR build/