diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
index 0ba09d16ac82..95f2b8c68351 100644
--- a/.buildkite/filebeat/filebeat-pipeline.yml
+++ b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -63,7 +63,7 @@ steps:
 #    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
 #
 #    steps:
-#      - label: ":linux:-ARM Unit Tests"
+#      - label: ":linux: ARM64 Unit Tests"
 #        key: "arm-extended"
 #        if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "filebeat for arm" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
 #        command:
@@ -90,7 +90,7 @@ steps:
 #          provider: "orka"
 #          imagePrefix: "generic-13-ventura-x64"
 #
-#      - label: ":windows:- {{IMAGE_WIN_2019}} Unit Tests"
+#      - label: ":windows: Win 2019 Unit Tests"
 #        key: "win-extended-2019"
 #        command: ".buildkite/filebeat/scripts/unit-tests-win.ps1"
 #        agents:
@@ -109,11 +109,27 @@ steps:
         key: "package-linux-x86"
         command:
           - "sudo apt-get update"
-            #          - "sudo apt-get install -y libsystemd-dev"
-            #          - "sudo apt install -y python3-pip"
           - "sudo apt-get install -y python3-venv"
           - ".buildkite/filebeat/scripts/package.sh"
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
 
+      - label: ":linux: Packaging Linux ARM"
+        key: "package-linux-arm"
+        env:
+          GOOS: "linux"
+#          GOARCH: "arm64"
+#          PLATFORM: "linux/arm64"
+#          PLATFORMS: "linux/arm64"
+          GOARCH: "amd64"
+          PLATFORMS: "linux/amd64"
+        command:
+          - "sudo apt-get update"
+          - "sudo apt-get install -y python3-venv"
+          - ".buildkite/filebeat/scripts/package.sh"
+        agents:
+          provider: "aws"
+          imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
+          instanceType: "t4g.large"
+
diff --git a/.buildkite/filebeat/scripts/package.sh b/.buildkite/filebeat/scripts/package.sh
index 1f9a1f6530ab..13005cda47f4 100755
--- a/.buildkite/filebeat/scripts/package.sh
+++ b/.buildkite/filebeat/scripts/package.sh
@@ -31,4 +31,5 @@ with_mage
 
 echo ":: Start Packaging ::"
 cd filebeat
+umask 0022
 mage package
diff --git a/.buildkite/filebeat/scripts/unit-tests-win.ps1 b/.buildkite/filebeat/scripts/unit-tests-win.ps1
index 4237331ed7b0..b3e3b0effe95 100644
--- a/.buildkite/filebeat/scripts/unit-tests-win.ps1
+++ b/.buildkite/filebeat/scripts/unit-tests-win.ps1
@@ -37,13 +37,18 @@ function installGoDependencies() {
 }
 
 fixCRLF
+
+$ErrorActionPreference = "Continue" # set +e
+
+Set-Location -Path filebeat
+New-Item -ItemType Directory -Force -Path "build"
 withGolang
 installGoDependencies
 
-$ErrorActionPreference = "Continue" # set +e
+$oldUmask = $ExecutionContext.SessionState.LanguageMode
+$ExecutionContext.SessionState.LanguageMode = "NoLanguage"
+$ExecutionContext.SessionState.LanguageMode = $oldUmask
 
-#New-Item -ItemType Directory -Force -Path "build"
-Set-Location filebeat
 mage build unitTest
 
 $EXITCODE=$LASTEXITCODE