diff --git a/.buildkite/pipeline.py b/.buildkite/pipeline.py
index 4ab7c6652e9..27626483e67 100755
--- a/.buildkite/pipeline.py
+++ b/.buildkite/pipeline.py
@@ -103,7 +103,7 @@ def create_entity(self) -> dict[str, Any]:
             ],
         }
         if len(self.envs) > 0:
-            data["env"] = [f"{k}:{v}" for k, v in self.envs]
+            data["env"] = self.envs
         return data
 
 
diff --git a/auditbeat/buildkite.yml b/auditbeat/buildkite.yml
index 3619d20c98f..d26828d9766 100644
--- a/auditbeat/buildkite.yml
+++ b/auditbeat/buildkite.yml
@@ -17,6 +17,8 @@ stages:
         crosscompile:
             command: "make -C auditbeat crosscompile"
             platform: "family/platform-ingest-beats-ubuntu-2204"
+            env:
+              GOX_FLAGS: "-arch amd64"
         unitTest-rhel-9:
             command: "mage -d auditbeat build unitTest"
             platform: "family/platform-ingest-beats-rhel-9"