diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
index 7eedd9d76fba..47422ff6dd83 100644
--- a/.buildkite/filebeat/filebeat-pipeline.yml
+++ b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -28,6 +28,7 @@ steps:
     steps:
       - label: ":ubuntu: Ubuntu Unit Tests"
         command: |
+          set -euo pipefail
           cd filebeat
           mage build unitTest
         agents:
@@ -43,6 +44,7 @@ steps:
 
       - label: ":ubuntu: Ubuntu Go Integration Tests"
         command: |
+          set -euo pipefail
           cd filebeat
           mage goIntegTest
         agents:
@@ -58,6 +60,7 @@ steps:
 
       - label: ":ubuntu: Ubuntu Python Integration Tests"
         command: |
+          set -euo pipefail
           cd filebeat
           mage pythonIntegTest
         agents:
@@ -109,6 +112,8 @@ steps:
 
   - group: "Filebeat Extended Tests"
     key: "filebeat-extended-tests"
+    if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm).*/
+
     steps:
       - label: ":mac: MacOS x64_64 Unit Tests"
         key: "macos-unit-tests-extended"
@@ -126,9 +131,9 @@ steps:
           - "filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "filebeat: Extended MacOS Unit Tests"
+              context: "filebeat: MacOS Unit Tests"
 
-      - label: ":mac: MacOS arm64 Unit Tests"
+      - label: ":mac: MacOS ARM Unit Tests"
         key: "macos-arm64-unit-tests-extended"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
@@ -144,12 +149,13 @@ steps:
           - "filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "filebeat: Extended MacOS ARM Unit Tests"
+              context: "filebeat: MacOS ARM Unit Tests"
 
       - label: ":linux: Ubuntu ARM Unit Tests"
         key: "extended-arm64-unit-test"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
         command: |
+          set -euo pipefail
           cd filebeat
           mage build unitTest
         agents:
@@ -166,6 +172,7 @@ steps:
   - group: "Extended Windows Tests"
     key: "filebeat-extended-win-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
+
     steps:
       - label: ":windows: Windows 2019 Unit Tests"
         key: "windows-extended-2019"
@@ -234,6 +241,7 @@ steps:
       - label: ":linux: Packaging Linux"
         key: "packaging-linux"
         command: |
+          set -euo pipefail
           cd filebeat
           mage package
         agents:
@@ -251,6 +259,7 @@ steps:
       - label: ":linux: Packaging ARM"
         key: "packaging-arm"
         command: |
+          set -euo pipefail
           cd filebeat
           mage package
         agents: