diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
index 8c817282343..e7444e338c9 100644
--- a/.buildkite/auditbeat/auditbeat-pipeline.yml
+++ b/.buildkite/auditbeat/auditbeat-pipeline.yml
@@ -27,11 +27,11 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "Auditbeat Check/Update"
+  - group: "Check/Update"
     key: "auditbeat-check-update"
 
     steps:
-      - label: "Run check/update"
+      - label: "Auditbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C auditbeat check update
@@ -47,7 +47,7 @@ steps:
         notify:
           - github_commit_status:
               context: "auditbeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
@@ -55,11 +55,11 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "auditbeat-check-update"
 
-  - group: "Auditbeat Mandatory Testing"
+  - group: "Mandatory Testing"
     key: "auditbeat-mandatory-tests"
 
     steps:
-      - label: ":ubuntu: Auditbeat Unit Tests"
+      - label: ":ubuntu: Auditbeat: Ubuntu x86_64 Unit Tests"
         command: |
           set -euo pipefail
           cd auditbeat
@@ -76,9 +76,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Ubuntu Unit Tests"
+              context: "auditbeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":rhel: Auditbeat Unit Tests"
+      - label: ":rhel: Auditbeat: RHEL9 Unit Tests"
         command: |
           set -euo pipefail
           cd auditbeat
@@ -95,9 +95,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: RHEL Unit Tests"
+              context: "auditbeat: RHEL9 Unit Tests"
 
-      - label: ":windows: Auditbeat Win-2016 Unit Tests"
+      - label: ":windows: Auditbeat: Win 2016 Unit Tests"
         command: |
           Set-Location -Path auditbeat
           mage build unitTest
@@ -115,9 +115,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Windows 2016 Unit Tests"
+              context: "auditbeat: Win 2016 Unit Tests"
 
-      - label: ":windows: Auditbeat Win-2022 Unit Tests"
+      - label: ":windows: Auditbeat: Win 2022 Unit Tests"
         command: |
           Set-Location -Path auditbeat
           mage build unitTest
@@ -135,9 +135,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Windows 2022 Unit Tests"
+              context: "auditbeat: Win 2022 Unit Tests"
 
-      - label: ":linux: Auditbeat Crosscompile"
+      - label: ":ubuntu: Auditbeat: Crosscompile"
         command: |
           make -C auditbeat crosscompile
         env:
@@ -153,12 +153,12 @@ steps:
           - github_commit_status:
               context: "auditbeat: Crosscompile"
 
-  - group: "Auditbeat Extended Tests"
+  - group: "Extended Tests"
     key: "auditbeat-extended-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" ||  build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm|integrations).*/
 
     steps:
-      - label: ":linux: Auditbeat Ubuntu Integration Tests"
+      - label: ":ubuntu: Auditbeat: Ubuntu x86_64 Integration Tests"
         key: "auditbeat-extended-integ-tests"
         if: build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/
         command: |
@@ -177,9 +177,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Linux Integration Tests"
+              context: "auditbeat: Ubuntu x86_64 Integration Tests"
 
-      - label: ":linux: Auditbeat Ubuntu arm64 Integration Tests"
+      - label: ":ubuntu: Auditbeat: Ubuntu arm64 Integration Tests"
         key: "auditbeat-extended-arm64-integ-tests"
         if: build.env("GITHUB_PR_LABELS") =~ /.*integrations.*/
         command: |
@@ -198,9 +198,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Linux arm64 Integration Tests"
+              context: "auditbeat: Ubuntu arm64 Integration Tests"
 
-      - label: ":linux: Auditbeat Ubuntu arm64 Unit Tests"
+      - label: ":ubuntu: Auditbeat: Ubuntu arm64 Unit Tests"
         key: "auditbeat-extended-arm64-unit-tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
         command: |
@@ -219,9 +219,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Linux arm64 Unit Tests"
+              context: "auditbeat: Ubuntu arm64 Unit Tests"
 
-      - label: ":mac: Auditbeat macOS x86_64 Unit Tests"
+      - label: ":mac: Auditbeat: macOS x86_64 Unit Tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
           set -euo pipefail
@@ -241,7 +241,7 @@ steps:
           - github_commit_status:
               context: "auditbeat: macOS x86_64 Unit Tests"
 
-      - label: ":mac: Auditbeat macOS arm64 ARM Unit Tests"
+      - label: ":mac: Auditbeat: macOS arm64 Unit Tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
           set -euo pipefail
@@ -261,12 +261,12 @@ steps:
           - github_commit_status:
               context: "auditbeat: macOS arm64 Unit Tests"
 
-  - group: "Auditbeat Windows Extended Testing"
+  - group: "Extended Windows Tests"
     key: "auditbeat-extended-tests-win"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
 
     steps:
-      - label: ":windows: Auditbeat Win-2019 Unit Tests"
+      - label: ":windows: Auditbeat: Win 2019 Unit Tests"
         key: "auditbeat-extended-win-2019-unit-tests"
         command: |
           Set-Location -Path auditbeat
@@ -285,9 +285,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Extended Windows 2019 Unit Tests"
+              context: "auditbeat: Win 2019 Unit Tests"
 
-      - label: ":windows: Auditbeat Win-10 Unit Tests"
+      - label: ":windows: Auditbeat: Win 10 Unit Tests"
         key: "auditbeat-extended-win-10-unit-tests"
         command: |
           Set-Location -Path auditbeat
@@ -306,9 +306,9 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Extended Windows 10 Unit Tests"
+              context: "auditbeat: Win 10 Unit Tests"
 
-      - label: ":windows: Auditbeat Win-11 Unit Tests"
+      - label: ":windows: Auditbeat: Win 11 Unit Tests"
         key: "auditbeat-extended-win-11-unit-tests"
         command: |
           Set-Location -Path auditbeat
@@ -327,7 +327,7 @@ steps:
           - "auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "auditbeat: Extended Windows 11 Unit Tests"
+              context: "auditbeat: Win 11 Unit Tests"
 
   - wait: ~
     # with PRs, we want to run packaging only if mandatory tests succeed
@@ -336,10 +336,10 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "auditbeat-mandatory-tests"
 
-  - group: "Auditbeat Packaging"
+  - group: "Packaging"
     key: "auditbeat-packaging"
     steps:
-      - label: ":ubuntu: Auditbeat/Packaging Linux"
+      - label: ":ubuntu: Auditbeat: Packaging Linux"
         key: "auditbeat-package-linux-x86"
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
@@ -360,7 +360,7 @@ steps:
           - github_commit_status:
               context: "auditbeat: Packaging Linux"
 
-      - label: ":linux: Auditbeat/Packaging Linux arm64"
+      - label: ":ubuntu: Auditbeat: Packaging Linux arm64"
         key: "auditbeat-package-linux-arm64"
         env:
           PLATFORMS: "linux/arm64"
diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
index 734e9889ec5..053dc24e080 100644
--- a/.buildkite/filebeat/filebeat-pipeline.yml
+++ b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -4,9 +4,11 @@ name: "beats-filebeat"
 env:
   AWS_ARM_INSTANCE_TYPE: "m6g.xlarge"
   AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64"
+
   GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8"
   GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
   GCP_WIN_MACHINE_TYPE: "n2-standard-8"
+
   IMAGE_MACOS_ARM: "generic-13-ventura-arm"
   IMAGE_MACOS_X86_64: "generic-13-ventura-x64"
   IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"
@@ -27,10 +29,10 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "Filebeat Check/Update"
+  - group: "Check/Update"
     key: "filebeat-check-update"
     steps:
-      - label: "Run check/update"
+      - label: "Filebeat: Run check/update"
         command: |
           set -eo pipefail
           make -C filebeat check update
@@ -46,7 +48,7 @@ steps:
         notify:
           - github_commit_status:
               context: "filebeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
@@ -54,10 +56,10 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "filebeat-check-update"
 
-  - group: "Filebeat Mandatory Tests"
+  - group: "Mandatory Tests"
     key: "filebeat-mandatory-tests"
     steps:
-      - label: ":ubuntu: Filebeat Unit Tests"
+      - label: ":ubuntu: Filebeat: Ubuntu x86_64 Unit Tests"
         command: |
           cd filebeat
           mage build unitTest
@@ -73,9 +75,9 @@ steps:
           - "filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "filebeat: Linux x86_64 Unit Tests"
+              context: "filebeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":ubuntu: Filebeat Go Integration Tests"
+      - label: ":ubuntu: Filebeat: Go Integration Tests"
         command: |
           cd filebeat
           mage goIntegTest
@@ -91,9 +93,9 @@ steps:
           - "filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "filebeat: Filebeat Go Integration Tests"
+              context: "filebeat: Go Integration Tests"
 
-      - label: ":ubuntu: Filebeat Python Integration Tests"
+      - label: ":ubuntu: Filebeat: Python Integration Tests"
         command: |
           cd filebeat
           mage pythonIntegTest
@@ -111,7 +113,7 @@ steps:
           - github_commit_status:
               context: "filebeat: Python Integration Tests"
 
-      - label: ":windows: Filebeat Windows 2016 Unit Tests"
+      - label: ":windows: Filebeat: Win 2016 Unit Tests"
         key: "windows-2016-unit-tests"
         command: |
           Set-Location -Path filebeat
@@ -130,9 +132,9 @@ steps:
           - "filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "filebeat: Windows 2016 Unit Tests"
+              context: "filebeat: Win 2016 Unit Tests"
 
-      - label: ":windows: Filebeat Windows 2022 Unit Tests"
+      - label: ":windows: Filebeat: Win 2022 Unit Tests"
         key: "windows-2022-unit-tests"
         command: |
           Set-Location -Path filebeat
@@ -151,14 +153,14 @@ steps:
           - "filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "filebeat: Windows 2022 Unit Tests"
+              context: "filebeat: Win 2022 Unit Tests"
 
-  - group: "Filebeat Extended Tests"
+  - group: "Extended Tests"
     key: "filebeat-extended-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm).*/
 
     steps:
-      - label: ":mac: Filebeat macOS x86_64 Unit Tests"
+      - label: ":mac: Filebeat: macOS x86_64 Unit Tests"
         key: "macos-unit-tests-extended"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
@@ -179,7 +181,7 @@ steps:
           - github_commit_status:
               context: "filebeat: macOS x86_64 Unit Tests"
 
-      - label: ":mac: Filebeat macOS arm64 Unit Tests"
+      - label: ":mac: Filebeat: macOS arm64 Unit Tests"
         key: "macos-arm64-unit-tests-extended"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
@@ -200,7 +202,7 @@ steps:
           - github_commit_status:
               context: "filebeat: macOS arm64 Unit Tests"
 
-      - label: ":linux: Filebeat arm64 Unit Tests"
+      - label: ":ubuntu: Filebeat: Ubuntu arm64 Unit Tests"
         key: "extended-arm64-unit-test"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
         command: |
@@ -218,14 +220,14 @@ steps:
           - "filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "filebeat: Linux arm64 Unit Tests"
+              context: "filebeat: Ubuntu arm64 Unit Tests"
 
-  - group: "Filebeat Extended Windows Tests"
+  - 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: Filebeat Windows 2019 Unit Tests"
+      - label: ":windows: Filebeat: Win 2019 Unit Tests"
         key: "windows-extended-2019"
         command: |
           Set-Location -Path filebeat
@@ -244,9 +246,9 @@ steps:
           - "filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "filebeat: Windows 2019 Unit Tests"
+              context: "filebeat: Win 2019 Unit Tests"
 
-      - label: ":windows: Filebeat Windows 11 Unit Tests"
+      - label: ":windows: Filebeat: Win 11 Unit Tests"
         key: "windows-extended-11"
         command: |
           Set-Location -Path filebeat
@@ -265,9 +267,9 @@ steps:
           - "filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "filebeat: Windows 11 Unit Tests"
+              context: "filebeat: Win 11 Unit Tests"
 
-      - label: ":windows: Filebeat Windows 10 Unit Tests"
+      - label: ":windows: Filebeat: Win 10 Unit Tests"
         key: "windows-extended-10"
         command: |
           Set-Location -Path filebeat
@@ -286,7 +288,7 @@ steps:
           - "filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "filebeat: Windows 10 Unit Tests"
+              context: "filebeat: Win 10 Unit Tests"
 
   - wait: ~
     # with PRs, we want to run packaging only if mandatory tests succeed
@@ -295,10 +297,10 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "filebeat-mandatory-tests"
 
-  - group: "Filebeat Packaging"
+  - group: "Packaging"
     key: "packaging"
     steps:
-      - label: ":linux: Filebeat Packaging Linux"
+      - label: ":ubuntu: Filebeat: Packaging Linux"
         key: "packaging-linux"
         command: |
           cd filebeat
@@ -319,7 +321,7 @@ steps:
           - github_commit_status:
               context: "filebeat: Packaging Linux"
 
-      - label: ":linux: Filebeat Packaging arm64"
+      - label: ":ubuntu: Filebeat: Packaging arm64"
         key: "packaging-arm"
         command: |
           cd filebeat
@@ -337,4 +339,4 @@ steps:
           PACKAGES: "docker"
         notify:
           - github_commit_status:
-              context: "filebeat: Packaging arm64"
+              context: "filebeat: Packaging Linux arm64"
diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
index 76001acec16..8da78502858 100644
--- a/.buildkite/heartbeat/heartbeat-pipeline.yml
+++ b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -26,11 +26,11 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "Heartbeat Check/Update"
+  - group: "Check/Update"
     key: "heartbeat-check-update"
-    
+
     steps:
-      - label: "Run check/update"
+      - label: "Heartbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C heartbeat check update
@@ -46,7 +46,7 @@ steps:
         notify:
           - github_commit_status:
               context: "hearbeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
@@ -54,11 +54,11 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "heartbeat-check-update"
 
-  - group: "Heartbeat Mandatory Testing"
+  - group: "Mandatory Testing"
     key: "heartbeat-mandatory-tests"
 
     steps:
-      - label: ":ubuntu: Heartbeat Unit Tests"
+      - label: ":ubuntu: Heartbeat: Ubuntu x86_64 Unit Tests"
         command: |
           cd heartbeat
           mage build unitTest
@@ -74,9 +74,9 @@ steps:
           - "heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "heartbeat: Ubuntu Unit Tests"
+              context: "heartbeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":rhel: Heartbeat Rhel9 Unit Tests"
+      - label: ":rhel: Heartbeat: RHEL9 Unit Tests"
         command: |
           cd heartbeat
           mage build unitTest
@@ -92,9 +92,9 @@ steps:
           - "heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "heartbeat: Rhel9 Unit Tests"
+              context: "heartbeat: RHEL9 Unit Tests"
 
-      - label: ":windows: Win-2016 Unit Tests"
+      - label: ":windows: Heartbeat: Win 2016 Unit Tests"
         key: "windows-2016"
         command: |
           Set-Location -Path heartbeat
@@ -112,9 +112,9 @@ steps:
           - "heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "heartbeat: Win-2016 Unit Tests"
+              context: "heartbeat: Win 2016 Unit Tests"
 
-      - label: ":windows: Heartbeat Win-2022 Unit Test"
+      - label: ":windows: Heartbeat: Win 2022 Unit Test"
         key: "windows-2022"
         command: |
           Set-Location -Path heartbeat
@@ -132,9 +132,9 @@ steps:
           - "heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "heartbeat: Win-2022 Unit Tests"
+              context: "heartbeat: Win 2022 Unit Tests"
 
-      - label: ":ubuntu: Heartbeat Go (Module) Integration Tests"
+      - label: ":ubuntu: Heartbeat: Go Integration Tests"
         command: |
           set -euo pipefail
           echo "~~~ Installing @elastic/synthetics"
@@ -161,7 +161,7 @@ steps:
           - github_commit_status:
               context: "heartbeat: Go Integration Tests"
 
-      - label: ":ubuntu: Heartbeat Python (Module) Integration Tests"
+      - label: ":ubuntu: Heartbeat: Python Integration Tests"
         command: |
           set -euo pipefail
           # defines the MODULE env var based on what's changed in a PR
@@ -185,12 +185,12 @@ steps:
           - github_commit_status:
               context: "heartbeat: Python Integration Tests"
 
-  - group: "Heartbeat Extended Tests"
+  - group: "Extended Tests"
     key: "heartbeat-extended-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm).*/
 
     steps:
-      - label: ":linux: Heartbeat arm64 Unit Tests"
+      - label: ":ubuntu: Heartbeat: Ubuntu arm64 Unit Tests"
         key: "arm-extended"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
         command: |
@@ -206,9 +206,9 @@ steps:
         artifact_paths: "heartbeat/build/*.xml"
         notify:
           - github_commit_status:
-              context: "heartbeat: Linux arm64 Unit Tests"
+              context: "heartbeat: Ubuntu arm64 Unit Tests"
 
-      - label: ":mac: macOS x86_64 Unit Tests"
+      - label: ":mac: Heartbeat: macOS x86_64 Unit Tests"
         key: "macos-extended"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
@@ -229,7 +229,7 @@ steps:
           - github_commit_status:
               context: "heartbeat: macOS x86_64 Unit Tests"
 
-      - label: ":mac: macOS arm64 Unit Tests"
+      - label: ":mac: Heartbeat: macOS arm64 Unit Tests"
         key: "macos-arm-extended"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
@@ -250,12 +250,12 @@ steps:
           - github_commit_status:
               context: "heartbeat: macOS arm64 Unit Tests"
 
-  - group: "Heartbeat Windows Extended Testing"
+  - group: "Extended Windows Tests"
     key: "heartbeat-extended-tests-win"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
 
     steps:
-      - label: ":windows: Win-2019 Unit Tests"
+      - label: ":windows: Heartbeat: Win 2019 Unit Tests"
         key: "heartbeat-win-extended-2019"
         command: |
           Set-Location -Path heartbeat
@@ -273,9 +273,9 @@ steps:
           - "heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "heartbeat: Win-2019 Unit Tests"
+              context: "heartbeat: Win 2019 Unit Tests"
 
-      - label: ":windows: Win-11 Unit Tests"
+      - label: ":windows: Heartbeat: Win 11 Unit Tests"
         key: "heartbeat-windows-extended-11"
         command: |
           Set-Location -Path heartbeat
@@ -293,9 +293,9 @@ steps:
           - "heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "heartbeat: Win-11 Unit Tests"
+              context: "heartbeat: Win 11 Unit Tests"
 
-      - label: ":windows: Win-10 Unit Tests"
+      - label: ":windows: Heartbeat: Win 10 Unit Tests"
         key: "heartbeat-windows-extended-10"
         command: |
           Set-Location -Path heartbeat
@@ -313,7 +313,7 @@ steps:
           - "heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "heartbeat: Win-10 Unit Tests"
+              context: "heartbeat: Win 10 Unit Tests"
 
   - wait: ~
     # with PRs, we want to run packaging only if mandatory tests succeed
@@ -322,10 +322,10 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "heartbeat-mandatory-tests"
 
-  - group: "Heartbeat Packaging"
+  - group: "Packaging"
     key: "heartbeat-packaging"
     steps:
-      - label: ":ubuntu: Heartbeat Packaging Linux"
+      - label: ":ubuntu: Heartbeat: Packaging Linux"
         key: "heartbeat-package-linux"
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
@@ -345,7 +345,7 @@ steps:
           - github_commit_status:
               context: "heartbeat: Packaging Linux"
 
-      - label: ":linux: Heartbeat Packaging Linux arm64"
+      - label: ":ubuntu: Heartbeat: Packaging Linux arm64"
         key: "heartbeat-package-linux-arm"
         env:
           PLATFORMS: "linux/arm64"
diff --git a/.buildkite/libbeat/pipeline.libbeat.yml b/.buildkite/libbeat/pipeline.libbeat.yml
index eb81dfb5a8e..f48370b0653 100644
--- a/.buildkite/libbeat/pipeline.libbeat.yml
+++ b/.buildkite/libbeat/pipeline.libbeat.yml
@@ -4,6 +4,7 @@ name: "beats-libbeat"
 env:
   AWS_ARM_INSTANCE_TYPE: "t4g.xlarge"
   AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2004-aarch64"
+
   GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8"
   GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
   IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"
@@ -16,10 +17,10 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "libbeat Check/Update"
+  - group: "Check/Update"
     key: "libbeat-check-update"
     steps:
-      - label: "Run check/update"
+      - label: "Libbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C libbeat check update
@@ -35,7 +36,7 @@ steps:
         notify:
           - github_commit_status:
               context: "libbeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
@@ -46,7 +47,7 @@ steps:
   - group: "Mandatory Tests"
     key: "mandatory-tests"
     steps:
-      - label: ":linux: Ubuntu Unit Tests"
+      - label: ":ubuntu: Libbeat: Ubuntu x86_64 Unit Tests"
         key: "mandatory-linux-unit-test"
         command: |
           set -euo pipefail
@@ -64,9 +65,9 @@ steps:
           - "libbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "libbeat: Ununtu Unit Tests"
+              context: "libbeat: Ununtu x86_64 Unit Tests"
 
-      - label: ":go: Go Integration Tests"
+      - label: ":ubuntu: Libbeat: Go Integration Tests"
         key: "mandatory-int-test"
         command: |
           set -euo pipefail
@@ -86,7 +87,7 @@ steps:
           - github_commit_status:
               context: "libbeat: Go Integration Tests"
 
-      - label: ":python: Python Integration Tests"
+      - label: ":ubuntu: Libbeat: Python Integration Tests"
         key: "mandatory-python-int-test"
         command: |
           set -euo pipefail
@@ -106,7 +107,7 @@ steps:
           - github_commit_status:
               context: "libbeat: Python Integration Tests"
 
-      - label: ":negative_squared_cross_mark: Cross compile"
+      - label: ":ubuntu: Libbeat: Crosscompile"
         key: "mandatory-cross-compile"
         command: |
           set -euo pipefail
@@ -124,9 +125,9 @@ steps:
           - "libbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "libbeat: Cross compile"
+              context: "libbeat: Crosscompile"
 
-      - label: ":testengine: Stress Tests"
+      - label: ":ubuntu: Libbeat: Stress Tests"
         key: "mandatory-stress-test"
         command: |
           set -euo pipefail
@@ -147,8 +148,9 @@ steps:
   - group: "Extended Tests"
     key: "extended-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
+
     steps:
-      - label: ":linux: Ubuntu ARM64 Unit Tests"
+      - label: ":ubuntu: Libbeat: Ubuntu arm64 Unit Tests"
         key: "extended-arm64-unit-tests"
         command: |
           set -euo pipefail
@@ -166,4 +168,4 @@ steps:
           - "libbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "libbeat: Ubuntu ARM64 Unit Tests"
+              context: "libbeat: Ubuntu arm64 Unit Tests"
diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml
index 82554ccb8fa..9090867c563 100644
--- a/.buildkite/metricbeat/pipeline.yml
+++ b/.buildkite/metricbeat/pipeline.yml
@@ -30,10 +30,10 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "Metricbeat Check/Update"
+  - group: "Check/Update"
     key: "metricbeat-check-update"
     steps:
-      - label: "Run check/update"
+      - label: "Metricbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C metricbeat check update
@@ -49,7 +49,7 @@ steps:
         notify:
           - github_commit_status:
               context: "metricbeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
@@ -57,11 +57,11 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "metricbeat-check-update"
 
-  - group: "Metricbeat Mandatory Tests"
+  - group: "Mandatory Tests"
     key: "metricbeat-mandatory-tests"
 
     steps:
-      - label: ":ubuntu: Metricbeat Unit Tests"
+      - label: ":ubuntu: Metricbeat: Ubuntu x86_64 Unit Tests"
         key: "mandatory-linux-unit-test"
         command: |
           cd metricbeat
@@ -78,9 +78,9 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: Linux x86_64 Unit Tests"
+              context: "metricbeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":ubuntu: Metricbeat Go Integration Tests"
+      - label: ":ubuntu: Metricbeat: Go Integration Tests"
         key: "mandatory-int-test"
         command: |
           set -euo pipefail
@@ -106,7 +106,7 @@ steps:
           - github_commit_status:
               context: "metricbeat: Go Integration Tests"
 
-      - label: ":ubuntu: Metricbeat Python Integration Tests"
+      - label: ":ubuntu: Metricbeat: Python Integration Tests"
         key: "mandatory-python-int-test"
         command: |
           set -euo pipefail
@@ -132,7 +132,7 @@ steps:
           - github_commit_status:
               context: "metricbeat: Python Integration Tests"
 
-      - label: ":ubuntu: Metricbeat Crosscompile"
+      - label: ":ubuntu: Metricbeat: Crosscompile"
         key: "mandatory-cross-compile"
         command: "make -C metricbeat crosscompile"
         retry:
@@ -149,7 +149,7 @@ steps:
           - github_commit_status:
               context: "metricbeat: Crosscompile"
 
-      - label: ":windows: Metricbeat Win-2016 Unit Tests"
+      - label: ":windows: Metricbeat: Win 2016 Unit Tests"
         command: |
           Set-Location -Path metricbeat
           mage build unitTest
@@ -168,9 +168,9 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: Win-2016 Unit Tests"
+              context: "metricbeat: Win 2016 Unit Tests"
 
-      - label: ":windows: Metricbeat Win-2022 Unit Tests"
+      - label: ":windows: Metricbeat: Win 2022 Unit Tests"
         command: |
           Set-Location -Path metricbeat
           mage build unitTest
@@ -189,14 +189,14 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: Win-2022 Unit Tests"
+              context: "metricbeat: Win 2022 Unit Tests"
 
-  - group: "Metricbeat Extended Windows Tests"
+  - group: "Extended Windows Tests"
     key: "metricbeat-extended-win-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
 
     steps:
-      - label: ":windows: Metricbeat Win 10 Unit Tests"
+      - label: ":windows: Metricbeat: Win 10 Unit Tests"
         command: |
           Set-Location -Path metricbeat
           mage build unitTest
@@ -217,7 +217,7 @@ steps:
           - github_commit_status:
               context: "metricbeat: Win 10 Unit Tests"
 
-      - label: ":windows: Metricbeat Win 11 Unit Tests"
+      - label: ":windows: Metricbeat: Win 11 Unit Tests"
         command: |
           Set-Location -Path metricbeat
           mage build unitTest
@@ -238,7 +238,7 @@ steps:
           - github_commit_status:
               context: "metricbeat: Win 11 Unit Tests"
 
-      - label: ":windows: Metricbeat Win-2019 Unit Tests"
+      - label: ":windows: Metricbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path metricbeat
           mage build unitTest
@@ -257,14 +257,14 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: Win-2019 Unit Tests"
+              context: "metricbeat: Win 2019 Unit Tests"
 
-  - group: "Metricbeat Extended macOS Tests"
-    key: "metricbeat-extended-macos-tests"
+  - group: "Extended Tests"
+    key: "metricbeat-extended-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
 
     steps:
-      - label: ":mac: Metricbeat macOS x64_64 Unit Tests"
+      - label: ":mac: Metricbeat: macOS x64_64 Unit Tests"
         key: "extended-macos-x64-64-unit-tests"
         command: |
           set -euo pipefail
@@ -284,7 +284,7 @@ steps:
           - github_commit_status:
               context: "metricbeat: macOS x86_64 Unit Tests"
 
-      - label: ":mac: Metricbeat macOS arm64 Unit Tests"
+      - label: ":mac: Metricbeat: macOS arm64 Unit Tests"
         key: "extended-macos-arm64-unit-tests"
         skip: "Skipping due to elastic/beats#33035"
         # https://github.com/elastic/beats/issues/33035
@@ -313,10 +313,10 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "metricbeat-mandatory-tests"
 
-  - group: "Metricbeat Packaging"
+  - group: "Packaging"
     key: "metricbeat-packaging"
     steps:
-      - label: ":ubuntu: Metricbeat Packaging Linux"
+      - label: ":ubuntu: Metricbeat: Packaging Linux"
         key: "packaging-linux"
         command: |
           cd metricbeat
@@ -337,7 +337,7 @@ steps:
           - github_commit_status:
               context: "metricbeat: Packaging Linux"
 
-      - label: ":ubuntu: Metricbeat Packaging Linux arm64"
+      - label: ":ubuntu: Metricbeat: Packaging Linux arm64"
         key: "packaging-arm"
         command: |
           cd metricbeat
diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml
index 4a9f402823c..91c32e8f27f 100644
--- a/.buildkite/packetbeat/pipeline.packetbeat.yml
+++ b/.buildkite/packetbeat/pipeline.packetbeat.yml
@@ -27,11 +27,11 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "Packetbeat Check/Update"
+  - group: "Check/Update"
     key: "packetbeat-check-update"
 
     steps:
-      - label: "Packetbeat Run check/update"
+      - label: "Packetbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C packetbeat check update
@@ -55,11 +55,11 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "packetbeat-check-update"
 
-  - group: "packetbeat Mandatory Tests"
+  - group: "Mandatory Tests"
     key: "packetbeat-mandatory-tests"
 
     steps:
-      - label: ":ubuntu: Packetbeat Linux x86_64 Unit Tests"
+      - label: ":ubuntu: Packetbeat: Ubuntu x86_64 Unit Tests"
         command: |
           cd packetbeat
           mage build unitTest
@@ -75,9 +75,9 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Linux x86_64 Unit Tests"
+              context: "packetbeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":rhel: Packetbeat RHEL9 Unit Tests"
+      - label: ":rhel: Packetbeat: RHEL9 Unit Tests"
         command: |
           cd packetbeat
           mage build unitTest
@@ -95,7 +95,7 @@ steps:
           - github_commit_status:
               context: "packetbeat: RHEL9 Unit Tests"
 
-      - label: ":windows: Packetbeat Win-2016 Unit Tests"
+      - label: ":windows: Packetbeat: Win 2016 Unit Tests"
         command: |
           Set-Location -Path packetbeat
           mage build unitTest
@@ -113,9 +113,9 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Win-2016 Unit Tests"
+              context: "packetbeat: Win 2016 Unit Tests"
 
-      - label: ":windows: Packetbeat Win-2022 Unit Tests"
+      - label: ":windows: Packetbeat: Win 2022 Unit Tests"
         command: |
           Set-Location -Path packetbeat
           mage build unitTest
@@ -133,14 +133,14 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Win-2022 Unit Tests"
+              context: "packetbeat: Win 2022 Unit Tests"
 
-  - group: " Packetbeat Extended Windows Tests"
+  - group: "Extended Windows Tests"
     key: "packetbeat-extended-windows-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
 
     steps:
-      - label: ":windows: Packetbeat Win 10 Unit Tests"
+      - label: ":windows: Packetbeat: Win 10 Unit Tests"
         command: |
           Set-Location -Path packetbeat
           mage build unitTest
@@ -158,9 +158,9 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Extended Windows 10 Unit Tests"
+              context: "packetbeat: Win 10 Unit Tests"
 
-      - label: ":windows: Packetbeat Win 11 Unit Tests"
+      - label: ":windows: Packetbeat: Win 11 Unit Tests"
         command: |
           Set-Location -Path packetbeat
           mage build unitTest
@@ -181,7 +181,7 @@ steps:
           - github_commit_status:
               context: "packetbeat: Win 11 Unit Tests"
 
-      - label: ":windows: Packetbeat Win-2019 Unit Tests"
+      - label: ":windows: Packetbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path packetbeat
           mage build unitTest
@@ -200,13 +200,13 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Win-2019 Unit Tests"
+              context: "packetbeat: Win 2019 Unit Tests"
 
-  - group: "Packetbeat Extended Tests"
+  - group: "Extended Tests"
     key: "extended-tests"
 
     steps:
-      - label: ":mac: Packetbeat macOS x86_64 Unit Tests"
+      - label: ":mac: Packetbeat: macOS x86_64 Unit Tests"
         key: "macos-x86-64-unit-tests-extended"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
@@ -227,7 +227,7 @@ steps:
           - github_commit_status:
               context: "packetbeat: macOS x86_64 Unit Tests"
 
-      - label: ":mac: Packetbeat macOS arm64 Unit Tests"
+      - label: ":mac: Packetbeat: macOS arm64 Unit Tests"
         key: "macos-arm64-unit-tests-extended"
         if: build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm).*/
         command: |
@@ -246,14 +246,14 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Extended MacOS arm64 Unit Tests"
+              context: "packetbeat: macOS arm64 Unit Tests"
 
-      - label: ":ubuntu: Linux arm64 Unit Tests"
+      - label: ":ubuntu: Packetbeat: Ubuntu arm64 Unit Tests"
         key: "linux-arm64-unit-tests-extended"
+        if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
         command: |
           cd packetbeat
           mage build unitTest
-        if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
         retry:
           automatic:
             - limit: 3
@@ -266,7 +266,7 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Linux arm64 Unit Tests"
+              context: "packetbeat: Ubuntu arm64 Unit Tests"
 
   - wait: ~
     # with PRs, we want to run packaging only if mandatory tests succeed
@@ -278,7 +278,7 @@ steps:
   - group: "Packetbeat Packaging"
     key: "packaging"
     steps:
-      - label: ":ubuntu: Packetbeat Packaging Linux"
+      - label: ":ubuntu: Packetbeat: Packaging Linux"
         key: "packaging-linux"
         command: |
           cd packetbeat
@@ -299,7 +299,7 @@ steps:
           - github_commit_status:
               context: "packetbeat: Packaging Linux"
 
-      - label: ":ubuntu: Packaging Linux arm64"
+      - label: ":ubuntu: Packetbeat: Packaging Linux arm64"
         key: "packaging-arm"
         command: |
           cd packetbeat
diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
index e35c232f19f..b3122c23168 100644
--- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml
+++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
@@ -23,11 +23,11 @@ env:
   DOCKER_PULL: 0
 
 steps:
-  - group: "Winlogbeat Check/Update"
+  - group: "Check/Update"
     key: "winlogbeat-check-update"
 
     steps:
-      - label: "Winlogbeat Run check/update"
+      - label: "Winlogbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C winlogbeat check update
@@ -51,11 +51,11 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "winlogbeat-check-update"
 
-  - group: "Winlogbeat Mandatory Tests"
+  - group: "Mandatory Tests"
     key: "winlogbeat-mandatory-tests"
 
     steps:
-      - label: ":ubuntu: Winlogbeat Crossccompile"
+      - label: ":ubuntu: Winlogbeat: Crossccompile"
         key: "mandatory-cross-compile"
         command: "make -C winlogbeat crosscompile"
         retry:
@@ -72,7 +72,7 @@ steps:
           - github_commit_status:
               context: "winlogbeat: Crosscompile"
 
-      - label: ":windows: Winlogbeat Win-2016 Unit Tests"
+      - label: ":windows: Winlogbeat: Win 2016 Unit Tests"
         command: |
           Set-Location -Path winlogbeat
           mage build unitTest
@@ -91,9 +91,9 @@ steps:
           - "winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "winlogbeat: Win-2016 Unit Tests"
+              context: "winlogbeat: Win 2016 Unit Tests"
 
-      - label: ":windows: Winlogbeat Win-2019 Unit Tests"
+      - label: ":windows: Winlogbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path winlogbeat
           mage build unitTest
@@ -112,9 +112,9 @@ steps:
           - "winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "winlogbeat: Win-2019 Unit Tests"
+              context: "winlogbeat: Win 2019 Unit Tests"
 
-      - label: ":windows: Winlogbeat Win-2022 Unit Tests"
+      - label: ":windows: Winlogbeat: Win 2022 Unit Tests"
         command: |
           Set-Location -Path winlogbeat
           mage build unitTest
@@ -133,14 +133,14 @@ steps:
           - "winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "Winlogbeat: Win-2022 Unit Tests"
+              context: "winlogbeat: Win 2022 Unit Tests"
 
-  - group: "Winlogbeat Extended Windows Tests"
+  - group: "Extended Windows Tests"
     key: "winlogbeat-extended-win-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
 
     steps:
-      - label: ":windows: Winlogbeat Win-10 Unit Tests"
+      - label: ":windows: Winlogbeat: Win 10 Unit Tests"
         command: |
           Set-Location -Path winlogbeat
           mage build unitTest
@@ -159,9 +159,9 @@ steps:
           - "winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "winlogbeat: Win-10 Unit Tests"
+              context: "winlogbeat: Win 10 Unit Tests"
 
-      - label: ":windows: Winlogbeat Win-11 Unit Tests"
+      - label: ":windows: Winlogbeat: Win 11 Unit Tests"
         command: |
           Set-Location -Path winlogbeat
           mage build unitTest
@@ -180,16 +180,19 @@ steps:
           - "winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "winlogbeat: Win-11 Unit Tests"
+              context: "winlogbeat: Win 11 Unit Tests"
 
   - wait: ~
+    # with PRs, we want to run packaging only if mandatory tests succeed
+    # for other cases, e.g. merge commits, we want to run packaging (and publish) independently of other tests
+    # this allows building DRA artifacts even if there is flakiness in mandatory tests
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "winlogbeat-mandatory-tests"
 
-  - group: "Winlogbeat Packaging"
+  - group: "Packaging"
     key: "winlogbeat-packaging"
     steps:
-      - label: ":ubuntu: Winlogbeat Packaging Linux"
+      - label: ":ubuntu: Winlogbeat: Packaging Linux"
         key: "packaging-linux"
         command: |
           cd winlogbeat
diff --git a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml
index 2b998f13a87..1c7e675a57e 100644
--- a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml
@@ -27,11 +27,11 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "x-pack/auditbeat Check/Update"
+  - group: "Check/Update"
     key: "x-pack-auditbeat-check-update"
 
     steps:
-      - label: "Run check/update"
+      - label: "x-pack/auditbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C x-pack/auditbeat check update
@@ -47,19 +47,19 @@ steps:
         notify:
           - github_commit_status:
               context: "x-pack/auditbeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
     # this allows building DRA artifacts even if there is flakiness in check/update step
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "x-pack-auditbeat-check-update"
-    
-  - group: "x-pack/auditbeat Mandatory Tests"
+
+  - group: "Mandatory Tests"
     key: "x-pack-auditbeat-mandatory-tests"
 
     steps:
-      - label: ":ubuntu: x-pack/auditbeat Build (MODULE) Tests"
+      - label: ":ubuntu: x-pack/auditbeat: Build Tests"
         key: "mandatory-linux-unit-test"
         command: |
           set -euo pipefail
@@ -81,9 +81,9 @@ steps:
           - "x-pack/auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/auditbeat: Build (MODULE) Tests"
+              context: "x-pack/auditbeat: Build Tests"
 
-      - label: ":rhel: x-pack/auditbeat RHEL9 Unit Tests"
+      - label: ":rhel: x-pack/auditbeat: RHEL9 Unit Tests"
         key: "mandatory-rhel9-unit-test"
         command: |
           cd x-pack/auditbeat
@@ -102,7 +102,7 @@ steps:
           - github_commit_status:
               context: "x-pack/auditbeat: RHEL9 Unit Tests"
 
-      - label: ":windows: x-pack/auditbeat Windows 2022 Unit Tests"
+      - label: ":windows: x-pack/auditbeat: Win 2022 Unit Tests"
         key: "mandatory-win-2022-unit-tests"
         command: |
           Set-Location -Path x-pack/auditbeat
@@ -121,9 +121,9 @@ steps:
           - "x-pack/auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/auditbeat: Windows 2022 Unit Tests"
+              context: "x-pack/auditbeat: Win 2022 Unit Tests"
 
-      - label: ":windows: x-pack/auditbeat Windows 2016 Unit Tests"
+      - label: ":windows: x-pack/auditbeat: Win 2016 Unit Tests"
         command: |
           Set-Location -Path x-pack/auditbeat
           mage build unitTest
@@ -142,14 +142,14 @@ steps:
           - "x-pack/auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/auditbeat: Windows 2016 Unit Tests"
+              context: "x-pack/auditbeat: Win 2016 Unit Tests"
 
-  - group: "x-pack/auditbeat Extended Windows Tests"
+  - group: "Extended Windows Tests"
     key: "x-pack-auditbeat-extended-win-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
 
     steps:
-      - label: ":windows: x-pack/auditbeat Windows 2019 Unit Tests"
+      - label: ":windows: x-pack/auditbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path x-pack/auditbeat
           mage build unitTest
@@ -168,9 +168,9 @@ steps:
           - "x-pack/auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/auditbeat: Windows 2019 Extended Tests"
+              context: "x-pack/auditbeat: Win 2019 Unit Tests"
 
-      - label: ":windows: x-pack/auditbeat Windows 10 Unit Tests"
+      - label: ":windows: x-pack/auditbeat: Win 10 Unit Tests"
         command: |
           Set-Location -Path x-pack/auditbeat
           mage build unitTest
@@ -189,9 +189,9 @@ steps:
           - "x-pack/auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/auditbeat: Windows 10 Extended Tests"
+              context: "x-pack/auditbeat: Win 10 Unit Tests"
 
-      - label: ":windows: x-pack/auditbeat Windows 11 Unit Tests"
+      - label: ":windows: x-pack/auditbeat: Win 11 Unit Tests"
         command: |
           Set-Location -Path x-pack/auditbeat
           mage build unitTest
@@ -210,14 +210,14 @@ steps:
           - "x-pack/auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/auditbeat: Windows 11 Extended Tests"
+              context: "x-pack/auditbeat: Win 11 Unit Tests"
 
-  - group: "x-pack/auditbeat Extended Tests"
+  - group: "Extended Tests"
     key: "x-pack-auditbeat-extended-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm).*/
 
     steps:
-      - label: ":mac: x-pack/auditbeat macOS x86_64 Unit Tests"
+      - label: ":mac: x-pack/auditbeat: macOS x86_64 Unit Tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
           set -euo pipefail
@@ -237,7 +237,7 @@ steps:
           - github_commit_status:
               context: "x-pack/auditbeat: macOS x86_64 Unit Tests"
 
-      - label: ":mac: x-pack/auditbeat macOS arm64 Unit Tests"
+      - label: ":mac: x-pack/auditbeat: macOS arm64 Unit Tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
           set -euo pipefail
@@ -257,7 +257,7 @@ steps:
           - github_commit_status:
               context: "x-pack/auditbeat: macOS arm64 Unit Tests"
 
-      - label: ":ubuntu: x-pack/auditbeat Linux arm64 Unit Tests"
+      - label: ":ubuntu: x-pack/auditbeat: Ubuntu arm64 Unit Tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
         command: |
           cd x-pack/auditbeat
@@ -274,7 +274,7 @@ steps:
           - "x-pack/auditbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/auditbeat: Linux arm64 Unit Tests"
+              context: "x-pack/auditbeat: Ubuntu arm64 Unit Tests"
 
   - wait: ~
     # with PRs, we want to run packaging only if mandatory tests succeed
@@ -284,11 +284,11 @@ steps:
     depends_on:
       - step: "x-pack-auditbeat-mandatory-tests"
 
-  - group: "x-pack/auditbeat Packaging"
+  - group: "Packaging"
     key: "x-pack-auditbeat-packaging"
 
     steps:
-      - label: ":ubuntu: x-pack/auditbeat Packaging Linux"
+      - label: ":ubuntu: x-pack/auditbeat: Packaging Linux"
         key: "packaging-linux"
         command: |
           cd x-pack/auditbeat
@@ -309,7 +309,7 @@ steps:
           - github_commit_status:
               context: "x-pack/auditbeat: Packaging Linux"
 
-      - label: ":ubuntu: x-pack/auditbeat Packaging Linux arm64"
+      - label: ":ubuntu: x-pack/auditbeat: Packaging Linux arm64"
         key: "packaging-arm"
         command: |
           cd x-pack/auditbeat
diff --git a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
index c867c14d37f..526785e61ac 100644
--- a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
@@ -18,10 +18,10 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "x-pack/dockerlogbeat Check/Update"
+  - group: "Check/Update"
     key: "x-pack-dockerlogbeat-check-update"
     steps:
-      - label: "Run check/update"
+      - label: "x-pack/dockerlogbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C x-pack/dockerlogbeat check update
@@ -37,7 +37,7 @@ steps:
         notify:
           - github_commit_status:
               context: "x-pack/dockerlogbeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
@@ -45,10 +45,11 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "x-pack-dockerlogbeat-check-update"
 
-  - group: "x-pack/dockerlogbeat Mandatory Tests"
+  - group: "Mandatory Tests"
     key: "xpack-dockerlogbeat-mandatory-tests"
+
     steps:
-      - label: ":ubuntu: x-pack/dockerlogbeat Ubuntu Unit Tests"
+      - label: ":ubuntu: x-pack/dockerlogbeat: Ubuntu x86_64 Unit Tests"
         key: "mandatory-linux-unit-test"
         command: |
           cd x-pack/dockerlogbeat
@@ -65,9 +66,9 @@ steps:
           - "x-pack/dockerlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/dockerlogbeat: Ubuntu Unit Tests"
+              context: "x-pack/dockerlogbeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":ubuntu: x-pack/dockerlogbeat Go (Module) Integration Tests"
+      - label: ":ubuntu: x-pack/dockerlogbeat: Go Integration Tests"
         key: "mandatory-int-test"
         command: |
           set -euo pipefail
@@ -89,7 +90,7 @@ steps:
           - "x-pack/dockerlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/dockerlogbeat: Go (Module) Integration Tests"
+              context: "x-pack/dockerlogbeat: Go Integration Tests"
 
   - wait: ~
     # with PRs, we want to run packaging only if mandatory tests succeed
@@ -99,11 +100,11 @@ steps:
     depends_on:
       - "xpack-dockerlogbeat-mandatory-tests"
 
-  - group: "x-pack/dockerlogbeat Packaging"
+  - group: "Packaging"
     key: "xpack-dockerlogbeat-packaging"
 
     steps:
-      - label: ":ubuntu: x-pack/dockerlogbeat Packaging Linux"
+      - label: ":ubuntu: x-pack/dockerlogbeat: Packaging Linux"
         key: "auditbeat-package-linux-x86"
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
@@ -123,7 +124,7 @@ steps:
           - github_commit_status:
               context: "x-pack/dockerlogbeat: Packaging Linux"
 
-      - label: ":linux: x-pack/dockerlogbeat Packaging Linux arm64"
+      - label: ":ubuntu: x-pack/dockerlogbeat: Packaging Linux arm64"
         key: "auditbeat-package-linux-arm"
         env:
           PLATFORMS: "linux/arm64"
diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
index ea57c4d47e4..a641390727c 100644
--- a/.buildkite/x-pack/pipeline.xpack.filebeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
@@ -26,10 +26,11 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "x-pack/filebeat Check/Update"
+  - group: "Check/Update"
     key: "x-pack-filebeat-check-update"
+
     steps:
-      - label: "Run check/update"
+      - label: "x-pack/filebeat: Run check/update"
         command: |
           set -eo pipefail
           make -C x-pack/filebeat check update
@@ -54,10 +55,11 @@ steps:
     depends_on: "x-pack-filebeat-check-update"
 
 
-  - group: "x-pack/filebeat Mandatory Tests"
+  - group: "Mandatory Tests"
     key: "x-pack-filebeat-mandatory-tests"
+
     steps:
-      - label: ":ubuntu: x-pack/filebeat Unit Tests"
+      - label: ":ubuntu: x-pack/filebeat: Ubuntu x86_64 Unit Tests"
         key: "x-pack-filebeat-mandatory-linux-unit-test"
         command: |
           cd x-pack/filebeat
@@ -74,9 +76,9 @@ steps:
           - "x-pack/filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/filebeat: Unit Tests"
+              context: "x-pack/filebeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":ubuntu: x-pack/filebeat Go Integration Tests"
+      - label: ":ubuntu: x-pack/filebeat: Go Integration Tests"
         key: "x-pack-filebeat-mandatory-int-test"
         command: |
           cd x-pack/filebeat
@@ -95,7 +97,7 @@ steps:
           - github_commit_status:
               context: "x-pack/filebeat: Go Integration Tests"
 
-      - label: ":ubuntu: x-pack/filebeat Python Integration Tests"
+      - label: ":ubuntu: x-pack/filebeat: Python Integration Tests"
         key: "x-pack-filebeat-mandatory-python-int-test"
         command: |
           cd x-pack/filebeat
@@ -114,7 +116,7 @@ steps:
           - github_commit_status:
               context: "x-pack/filebeat: Python Integration Tests"
 
-      - label: ":windows: x-pack/filebeat Win-2022 Unit Tests"
+      - label: ":windows: x-pack/filebeat: Win 2022 Unit Tests"
         command: |
           Set-Location -Path x-pack/filebeat
           mage build unitTest
@@ -133,9 +135,9 @@ steps:
           - "x-pack/filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/filebeat: Win-2022 Unit Tests"
+              context: "x-pack/filebeat: Win 2022 Unit Tests"
 
-      - label: ":windows: x-pack/filebeat Win-2016 Unit Tests"
+      - label: ":windows: x-pack/filebeat: Win 2016 Unit Tests"
         command: |
           Set-Location -Path x-pack/filebeat
           mage build unitTest
@@ -154,14 +156,14 @@ steps:
           - "x-pack/filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/filebeat: Win-2016 Unit Tests"
+              context: "x-pack/filebeat: Win 2016 Unit Tests"
 
-  - group: "x-pack/filebeat Extended Windows Tests"
+  - group: "Extended Windows Tests"
     key: "x-pack-filebeat-extended-win-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
 
     steps:
-      - label: ":windows: x-pack/filebeat Win-2019 Unit Tests"
+      - label: ":windows: x-pack/filebeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path x-pack/filebeat
           mage build unitTest
@@ -180,9 +182,9 @@ steps:
           - "x-pack/filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/filebeat: Win-2019 Unit Tests"
+              context: "x-pack/filebeat: Win 2019 Unit Tests"
 
-      - label: ":windows: x-pack/filebeat Win 10 Unit Tests"
+      - label: ":windows: x-pack/filebeat: Win 10 Unit Tests"
         command: |
           Set-Location -Path x-pack/filebeat
           mage build unitTest
@@ -203,7 +205,7 @@ steps:
           - github_commit_status:
               context: "x-pack/filebeat: Win 10 Unit Tests"
 
-      - label: ":windows: x-pack/filebeat Win 11 Unit Tests"
+      - label: ":windows: x-pack/filebeat: Win 11 Unit Tests"
         command: |
           Set-Location -Path x-pack/filebeat
           mage build unitTest
@@ -224,16 +226,19 @@ steps:
           - github_commit_status:
               context: "x-pack/filebeat: Win 11 Unit Tests"
 
-  - group: "x-pack/filebeat Extended Tests"
+  - group: "Extended Tests"
     key: "x-pack-filebeat-extended-tests"
 
     steps:
-      - label: ":ubuntu: x-pack/filebeat Linux arm64 Unit Tests"
+      - label: ":ubuntu: x-pack/filebeat: Ubuntu arm64 Unit Tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
         key: "x-pack-filebeat-mandatory-linux-arm-unit-test"
         command: |
           cd x-pack/filebeat
           mage build unitTest
+        retry:
+          automatic:
+            - limit: 3
         agents:
           provider: "aws"
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
@@ -243,9 +248,9 @@ steps:
           - "x-pack/filebeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/filebeat: Linux arm64 Unit Tests"
+              context: "x-pack/filebeat: Ubuntu arm64 Unit Tests"
 
-      - label: ":mac: x-pack/filebeat macOS x86_64 Unit Tests"
+      - label: ":mac: x-pack/filebeat: macOS x86_64 Unit Tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
           set -euo pipefail
@@ -265,7 +270,7 @@ steps:
           - github_commit_status:
               context: "x-pack/filebeat: macOS x86_64 Unit Tests"
 
-      - label: ":mac: x-pack/filebeat macOS arm64 Unit Tests"
+      - label: ":mac: x-pack/filebeat: macOS arm64 Unit Tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
           set -euo pipefail
@@ -285,7 +290,7 @@ steps:
           - github_commit_status:
               context: "x-pack/filebeat: macOS arm64 Unit Tests"
 
-      - label: ":ubuntu: x-pack/filebeat AWS Tests"
+      - label: ":ubuntu: x-pack/filebeat: AWS Tests"
         key: "x-pack-filebeat-extended-cloud-test"
         skip: "skipping as it was on Jenkins: elastic/ingest-dev#3467"
         # Related issue: https://github.com/elastic/ingest-dev/issues/3467
@@ -321,10 +326,11 @@ steps:
     depends_on:
       - step: "x-pack-filebeat-mandatory-tests"
 
-  - group: "x-pack/filebeat Packaging"
+  - group: "Packaging"
     key: "x-pack-filebeat-packaging"
+
     steps:
-      - label: ":linux: x-pack/filebeat Packaging Linux"
+      - label: ":linux: x-pack/filebeat: Packaging Linux"
         key: "packaging-linux"
         command: |
           cd x-pack/filebeat
@@ -345,7 +351,7 @@ steps:
           - github_commit_status:
               context: "x-pack/filebeat: Packaging Linux"
 
-      - label: ":linux: x-pack/filebeat Packaging arm64"
+      - label: ":linux: x-pack/filebeat: Packaging arm64"
         key: "packaging-arm"
         command: |
           cd x-pack/filebeat
diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
index 3c208c5a9c4..1227b8e7570 100644
--- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
@@ -31,11 +31,11 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "x-pack/heartbeat Check/Update"
+  - group: "Check/Update"
     key: "x-pack-heartbeat-check-update"
-    
+
     steps:
-      - label: "Run check/update"
+      - label: "x-pack/heartbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C x-pack/heartbeat check update
@@ -51,7 +51,7 @@ steps:
         notify:
           - github_commit_status:
               context: "x-pack/heartbeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
@@ -59,10 +59,11 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "x-pack-heartbeat-check-update"
 
-  - group: "x-pack/heartbeat Mandatory Tests"
+  - group: "Mandatory Tests"
     key: "x-pack-heartbeat-mandatory-tests"
+
     steps:
-      - label: ":ubuntu: x-pack/heartbeat Ubuntu Unit Tests"
+      - label: ":ubuntu: x-pack/heartbeat: Ubuntu x86_64 Unit Tests"
         key: "mandatory-linux-unit-test"
         command: |
           set -euo pipefail
@@ -83,9 +84,9 @@ steps:
           - "x-pack/heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/heartbeat: Ubuntu Unit Tests"
+              context: "x-pack/heartbeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":ubuntu: x-pack/heartbeat Go Integration Tests"
+      - label: ":ubuntu: x-pack/heartbeat: Go Integration Tests"
         key: "mandatory-int-test"
         command: |
           set -euo pipefail
@@ -108,7 +109,7 @@ steps:
           - github_commit_status:
               context: "x-pack/heartbeat: Go Integration Tests"
 
-      - label: ":windows: x-pack/heartbeat Windows 2016 Unit Tests"
+      - label: ":windows: x-pack/heartbeat: Win 2016 Unit Tests"
         key: "mandatory-win-2016-unit-tests"
         skip: "skipping due to elastic/beats#23957 and elastic/beats#23958"
         command: |
@@ -128,10 +129,10 @@ steps:
           - "x-pack/heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/heartbeat: Windows 2016 Unit Tests"
+              context: "x-pack/heartbeat: Win 2016 Unit Tests"
 
       # Doesn't exist in Jenkins
-      - label: ":windows: x-pack/heartbeat Windows 2022 Unit Tests"
+      - label: ":windows: x-pack/heartbeat: Win 2022 Unit Tests"
         key: "mandatory-win-2022-unit-tests"
         skip: "skipping due to elastic/beats#23957 and elastic/beats#23958"
         command: |
@@ -151,15 +152,15 @@ steps:
           - "x-pack/heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/heartbeat: Windows 2022 Unit Tests"
+              context: "x-pack/heartbeat: Win 2022 Unit Tests"
 
-  - group: "x-pack/heartbeat Extended Windows Tests"
+  - group: "Extended Windows Tests"
     key: "x-pack-heartbeat-extended-win-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
     skip: "skipping due to elastic/beats#23957 and elastic/beats#23958"
 
     steps:
-      - label: ":windows: x-pack/heartbeat Windows 10 Unit Tests"
+      - label: ":windows: x-pack/heartbeat: Win 10 Unit Tests"
         command: |
           Set-Location -Path x-pack/heartbeat
           mage build test
@@ -178,10 +179,10 @@ steps:
           - "x-pack/heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/heartbeat: Windows 10 Unit Tests"
+              context: "x-pack/heartbeat: Win 10 Unit Tests"
 
       # Doesn't exist in Jenkins
-      - label: ":windows: x-pack/heartbeat Windows 11 Unit Tests"
+      - label: ":windows: x-pack/heartbeat: Win 11 Unit Tests"
         command: |
           Set-Location -Path x-pack/heartbeat
           mage build test
@@ -200,9 +201,9 @@ steps:
           - "x-pack/heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/heartbeat: Windows 11 Unit Tests"
+              context: "x-pack/heartbeat: Win 11 Unit Tests"
 
-      - label: ":windows: x-pack/heartbeat Windows 2019 Unit Tests"
+      - label: ":windows: x-pack/heartbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path x-pack/heartbeat
           mage build test
@@ -221,14 +222,14 @@ steps:
           - "x-pack/heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/heartbeat: Windows 2019 Unit Tests"
+              context: "x-pack/heartbeat: Win 2019 Unit Tests"
 
-  - group: "x-pack/heartbeat macOS Extended Tests"
+  - group: "Extended Tests"
     key: "x-pack-heartbeat-extended-tests-macos"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
 
     steps:
-      - label: ":mac: x-pack/heartbeat macOS x86_64 Unit Tests"
+      - label: ":mac: x-pack/heartbeat: macOS x86_64 Unit Tests"
         command: |
           set -euo pipefail
           source .buildkite/scripts/install_macos_tools.sh
@@ -249,7 +250,7 @@ steps:
           - github_commit_status:
               context: "x-pack/heartbeat: macOS x86_64 Extended Tests"
 
-      - label: ":mac: x-pack/heartbeat macOS arm64 Unit Tests"
+      - label: ":mac: x-pack/heartbeat: macOS arm64 Unit Tests"
         command: |
           set -euo pipefail
           source .buildkite/scripts/install_macos_tools.sh
@@ -278,11 +279,12 @@ steps:
     depends_on:
       - step: "x-pack-heartbeat-mandatory-tests"
 
-  - group: "x-pack/heartbeat Packaging"
+  - group: "Packaging"
     key: "x-pack-heartbeat-packaging"
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
+
     steps:
-      - label: ":ubuntu: x-pack/heartbeat Packaging Linux x86_64"
+      - label: ":ubuntu: x-pack/heartbeat: Packaging Linux"
         key: "packaging-linux"
         command: |
           cd x-pack/heartbeat
@@ -301,9 +303,9 @@ steps:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         notify:
           - github_commit_status:
-              context: "x-pack/heartbeat: Packaging Linux x86_64"
+              context: "x-pack/heartbeat: Packaging Linux"
 
-      - label: ":ubuntu: x-pack/heartbeat Packaging Linux arm64"
+      - label: ":ubuntu: x-pack/heartbeat: Packaging Linux arm64"
         key: "packaging-arm"
         command: |
           cd x-pack/heartbeat
diff --git a/.buildkite/x-pack/pipeline.xpack.libbeat.yml b/.buildkite/x-pack/pipeline.xpack.libbeat.yml
index 2a8935e39f5..a34c8ac732d 100644
--- a/.buildkite/x-pack/pipeline.xpack.libbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.libbeat.yml
@@ -24,10 +24,10 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "x-pack/libbeat Check/Update"
+  - group: "Check/Update"
     key: "x-pack-libbeat-check-update"
     steps:
-      - label: "Run check/update"
+      - label: "x-pack/libbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C x-pack/libbeat check update
@@ -43,7 +43,7 @@ steps:
         notify:
           - github_commit_status:
               context: "x-pack/libbeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
@@ -51,11 +51,11 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "x-pack-libbeat-check-update"
 
-  - group: "x-pack/libbeat Mandatory Tests"
+  - group: "Mandatory Tests"
     key: "x-pack-libbeat-mandatory-tests"
 
     steps:
-      - label: ":ubuntu: x-pack/libbeat Unit Tests"
+      - label: ":ubuntu: x-pack/libbeat: Ubuntu x86_64 Unit Tests"
         key: "mandatory-linux-unit-test"
         command: |
           cd x-pack/libbeat
@@ -72,9 +72,9 @@ steps:
           - "x-pack/libbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/libbeat: Unit Tests"
+              context: "x-pack/libbeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":ubuntu: x-pack/libbeat Go Integration Tests"
+      - label: ":ubuntu: x-pack/libbeat: Go Integration Tests"
         key: "mandatory-int-test"
         command: |
           cd x-pack/libbeat
@@ -93,7 +93,7 @@ steps:
           - github_commit_status:
               context: "x-pack/libbeat: Go Integration Tests"
 
-      - label: ":ubuntu: x-pack/libbeat Python Integration Tests"
+      - label: ":ubuntu: x-pack/libbeat: Python Integration Tests"
         key: "mandatory-python-int-test"
         command: |
           cd x-pack/libbeat
@@ -112,7 +112,7 @@ steps:
           - github_commit_status:
               context: "x-pack/libbeat: Python Integration Tests"
 
-      - label: ":windows: x-pack/libbeat Win-2016 Unit Tests"
+      - label: ":windows: x-pack/libbeat: Win 2016 Unit Tests"
         command: |
           Set-Location -Path x-pack/libbeat
           mage -w reader\etw build goUnitTest
@@ -131,9 +131,9 @@ steps:
           - "x-pack/libbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/libbeat: Win-2016 Unit Tests"
+              context: "x-pack/libbeat: Win 2016 Unit Tests"
 
-      - label: ":windows: x-pack/libbeat Win-2022 Unit Tests"
+      - label: ":windows: x-pack/libbeat: Win 2022 Unit Tests"
         command: |
           Set-Location -Path x-pack/libbeat
           mage -w reader\etw build goUnitTest
@@ -152,14 +152,14 @@ steps:
           - "x-pack/libbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/libbeat: Win-2022 Unit Tests"
+              context: "x-pack/libbeat: Win 2022 Unit Tests"
 
-  - group: "x-pack/libbeat Extended Windows Tests"
+  - group: "Extended Windows Tests"
     key: "x-pack-libbeat-extended-win-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
 
     steps:
-      - label: ":windows: x-pack/libbeat Win 10 Unit Tests"
+      - label: ":windows: x-pack/libbeat: Win 10 Unit Tests"
         command: |
           Set-Location -Path x-pack/libbeat
           mage -w reader\etw build goUnitTest
@@ -180,7 +180,7 @@ steps:
           - github_commit_status:
               context: "x-pack/libbeat: Win 10 Unit Tests"
 
-      - label: ":windows: x-pack/libbeat Win 11 Unit Tests"
+      - label: ":windows: x-pack/libbeat: Win 11 Unit Tests"
         command: |
           Set-Location -Path x-pack/libbeat
           mage -w reader\etw build goUnitTest
@@ -201,7 +201,7 @@ steps:
           - github_commit_status:
               context: "x-pack/libbeat: Win 11 Unit Tests"
 
-      - label: ":windows: x-pack/libbeat Win-2019 Unit Tests"
+      - label: ":windows: x-pack/libbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path x-pack/libbeat
           mage -w reader\etw build goUnitTest
@@ -220,14 +220,14 @@ steps:
           - "x-pack/libbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/libbeat: Win-2019 Unit Tests"
+              context: "x-pack/libbeat: Win 2019 Unit Tests"
 
-  - group: "x-pack/libbeat Extended Tests"
+  - group: "Extended Tests"
     key: "x-pack-libbeat-extended-tests-linux-arm"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
 
     steps:
-      - label: ":ubuntu: x-pack/libbeat arm64 Unit Tests"
+      - label: ":ubuntu: x-pack/libbeat: Ubuntu arm64 Unit Tests"
         key: "extended-arm64-unit-tests"
         command: |
           cd x-pack/libbeat
@@ -244,4 +244,4 @@ steps:
           - "x-pack/libbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/libbeat: Linux arm64 Unit Tests"
+              context: "x-pack/libbeat: Ubuntu arm64 Unit Tests"
diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
index 6a771045b89..693b10c8683 100644
--- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
@@ -26,10 +26,10 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "x-pack/metricbeat Check/Update"
+  - group: "Check/Update"
     key: "x-pack-metricbeat-check-update"
     steps:
-      - label: "Run check/update"
+      - label: "x-pack/metricbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C x-pack/metricbeat check update
@@ -53,11 +53,11 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "x-pack-metricbeat-check-update"
 
-  - group: "x-pack/metricbeat Mandatory Tests"
+  - group: "Mandatory Tests"
     key: "x-pack-metricbeat-mandatory-tests"
 
     steps:
-      - label: ":ubuntu: x-pack/metricbeat Linux x86_64 Unit Tests"
+      - label: ":ubuntu: x-pack/metricbeat: Ubuntu x86_64 Unit Tests"
         key: "mandatory-linux-unit-test"
         command: |
           cd x-pack/metricbeat
@@ -74,9 +74,9 @@ steps:
           - "x-pack/metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/metricbeat: Linux x86_64 Unit Tests"
+              context: "x-pack/metricbeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":ubuntu: x-pack/metricbeat Go (MODULE) Integration Tests"
+      - label: ":ubuntu: x-pack/metricbeat: Go (MODULE) Integration Tests"
         key: "mandatory-int-test"
         command: |
           set -euo pipefail
@@ -99,7 +99,7 @@ steps:
           - github_commit_status:
               context: "x-pack/metricbeat: Go (MODULE) Integration Tests"
 
-      - label: ":ubuntu: x-pack/metricbeat Python (MODULE) Integration Tests"
+      - label: ":ubuntu: x-pack/metricbeat: Python (MODULE) Integration Tests"
         key: "mandatory-python-int-test"
         command: |
           set -euo pipefail
@@ -122,7 +122,7 @@ steps:
           - github_commit_status:
               context: "x-pack/metricbeat: Python (MODULE) Integration Tests"
 
-      - label: ":windows: x-pack/metricbeat Win-2016 Unit Tests"
+      - label: ":windows: x-pack/metricbeat: Win 2016 Unit Tests"
         command: |
           Set-Location -Path x-pack/metricbeat
           mage build unitTest
@@ -141,9 +141,9 @@ steps:
           - "x-pack/metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/metricbeat: Win-2016 Unit Tests"
+              context: "x-pack/metricbeat: Win 2016 Unit Tests"
 
-      - label: ":windows: x-pack/metricbeat Win-2022 Unit Tests"
+      - label: ":windows: x-pack/metricbeat: Win 2022 Unit Tests"
         command: |
           Set-Location -Path x-pack/metricbeat
           mage build unitTest
@@ -162,14 +162,14 @@ steps:
           - "x-pack/metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/metricbeat: Win-2022 Unit Tests"
+              context: "x-pack/metricbeat: Win 2022 Unit Tests"
 
-  - group: "x-pack/metricbeat Extended Windows Tests"
+  - group: "Extended Windows Tests"
     key: "x-pack-metricbeat-extended-win-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
 
     steps:
-      - label: ":windows: x-pack/metricbeat Win 10 Unit Tests"
+      - label: ":windows: x-pack/metricbeat: Win 10 Unit Tests"
         command: |
           Set-Location -Path x-pack/metricbeat
           mage build unitTest
@@ -190,7 +190,7 @@ steps:
           - github_commit_status:
               context: "x-pack/metricbeat: Win 10 Unit Tests"
 
-      - label: ":windows: x-pack/metricbeat Win 11 Unit Tests"
+      - label: ":windows: x-pack/metricbeat: Win 11 Unit Tests"
         command: |
           Set-Location -Path x-pack/metricbeat
           mage build unitTest
@@ -211,7 +211,7 @@ steps:
           - github_commit_status:
               context: "x-pack/metricbeat: Win 11 Unit Tests"
 
-      - label: ":windows: x-pack/metricbeat Win-2019 Unit Tests"
+      - label: ":windows: x-pack/metricbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path x-pack/metricbeat
           mage build unitTest
@@ -230,14 +230,14 @@ steps:
           - "x-pack/metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/metricbeat: Win-2019 Unit Tests"
+              context: "x-pack/metricbeat: Win 2019 Unit Tests"
 
-  - group: "x-pack/metricbeat Extended Tests"
+  - group: "Extended Tests"
     key: "x-pack-metricbeat-extended-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false"  || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|aws).*/
 
     steps:
-      - label: ":mac: x-pack/metricbeat macOS x86_64 Unit Tests"
+      - label: ":mac: x-pack/metricbeat: macOS x86_64 Unit Tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
           set -euo pipefail
@@ -256,7 +256,7 @@ steps:
           - github_commit_status:
               context: "x-pack/metricbeat: macOS x86_64 Unit Tests"
 
-      - label: ":mac: x-pack/metricbeat macOS arm64 Unit Tests"
+      - label: ":mac: x-pack/metricbeat: macOS arm64 Unit Tests"
         skip: "Skipping due to elastic/beats#33036 & elastic/ingest-dev#3400"
         # https://github.com/elastic/beats/issues/33036 https://github.com/elastic/ingest-dev/issues/3400
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
@@ -277,7 +277,7 @@ steps:
           - github_commit_status:
               context: "x-pack/metricbeat: macOS arm64 Unit Tests"
 
-      - label: ":ubuntu: x-pack/metricbeat AWS Tests"
+      - label: ":ubuntu: x-pack/metricbeat: AWS Tests"
         key: "x-pack-metricbeat-extended-cloud-test"
         if: build.env("GITHUB_PR_LABELS") =~ /.*aws.*/
         command: |
@@ -311,10 +311,11 @@ steps:
     depends_on:
       - step: "x-pack-metricbeat-mandatory-tests"
 
-  - group: "x-pack/metricbeat Packaging"
+  - group: "Packaging"
     key: "x-pack-metricbeat-packaging"
+
     steps:
-      - label: ":ubuntu: x-pack/metricbeat Packaging Linux"
+      - label: ":ubuntu: x-pack/metricbeat: Packaging Linux"
         key: "packaging-linux"
         command: |
           cd x-pack/metricbeat
@@ -335,7 +336,7 @@ steps:
           - github_commit_status:
               context: "x-pack/metricbeat: Packaging Linux"
 
-      - label: ":ubuntu: x-pack/metricbeat Packaging linux arm64"
+      - label: ":ubuntu: x-pack/metricbeat: Packaging linux arm64"
         key: "packaging-arm"
         command: |
           cd x-pack/metricbeat
diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
index 4d2236fe459..f1a0d2a90f8 100644
--- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
@@ -23,10 +23,11 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "x-pack/osquerybeat Check/Update"
+  - group: "Check/Update"
     key: "x-pack-osquerybeat-check-update"
+
     steps:
-      - label: "Run check/update"
+      - label: "x-pack/osquerybeat: Run check/update"
         command: |
           set -eo pipefail
           make -C x-pack/osquerybeat check update
@@ -42,7 +43,7 @@ steps:
         notify:
           - github_commit_status:
               context: "x-pack/osquerybeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
@@ -50,11 +51,11 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "x-pack-osquerybeat-check-update"
 
-  - group: "x-pack/osquerybeat Mandatory Tests"
+  - group: "Mandatory Tests"
     key: "x-pack-osquerybeat-mandatory-tests"
 
     steps:
-      - label: ":ubuntu: x-pack/osquerybeat Linux x86_64 Unit Tests"
+      - label: ":ubuntu: x-pack/osquerybeat: Ubuntu x86_64 Unit Tests"
         key: "mandatory-linux-unit-test"
         command: |
           cd x-pack/osquerybeat
@@ -71,9 +72,9 @@ steps:
           - "x-pack/osquerybeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/osquerybeat: Linux x86_64 Unit Tests"
+              context: "x-pack/osquerybeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":ubuntu: x-pack/osquerybeat Go Integration Tests"
+      - label: ":ubuntu: x-pack/osquerybeat: Go Integration Tests"
         key: "mandatory-int-test"
         command: |
           cd x-pack/osquerybeat
@@ -92,7 +93,7 @@ steps:
           - github_commit_status:
               context: "x-pack/osquerybeat: Go Integration Tests"
 
-      - label: ":windows: x-pack/osquerybeat Win-2016 Unit Tests"
+      - label: ":windows: x-pack/osquerybeat: Win 2016 Unit Tests"
         command: |
           Set-Location -Path x-pack/osquerybeat
           mage build unitTest
@@ -111,9 +112,9 @@ steps:
           - "x-pack/osquerybeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/osquerybeat: Win-2016 Unit Tests"
+              context: "x-pack/osquerybeat: Win 2016 Unit Tests"
 
-      - label: ":windows: x-pack/osquerybeat Win-2022 Unit Tests"
+      - label: ":windows: x-pack/osquerybeat: Win 2022 Unit Tests"
         command: |
           Set-Location -Path x-pack/osquerybeat
           mage build unitTest
@@ -134,12 +135,12 @@ steps:
           - github_commit_status:
               context: "x-pack/osquerybeat: Win-2022 Unit Tests"
 
-  - group: "x-pack/osquerybeat Extended Windows Tests"
+  - group: "Extended Windows Tests"
     key: "x-pack-osquerybeat-extended-win-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
 
     steps:
-      - label: ":windows: x-pack/osquerybeat Win 10 Unit Tests"
+      - label: ":windows: x-pack/osquerybeat: Win 10 Unit Tests"
         command: |
           Set-Location -Path x-pack/osquerybeat
           mage build unitTest
@@ -160,7 +161,7 @@ steps:
           - github_commit_status:
               context: "x-pack/osquerybeat: Win 10 Unit Tests"
 
-      - label: ":windows: x-pack/osquerybeat Win 11 Unit Tests"
+      - label: ":windows: x-pack/osquerybeat: Win 11 Unit Tests"
         command: |
           Set-Location -Path x-pack/osquerybeat
           mage build unitTest
@@ -181,7 +182,7 @@ steps:
           - github_commit_status:
               context: "x-pack/osquerybeat: Win 11 Unit Tests"
 
-      - label: ":windows: x-pack/osquerybeat Win-2019 Unit Tests"
+      - label: ":windows: x-pack/osquerybeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path x-pack/osquerybeat
           mage build unitTest
@@ -200,14 +201,14 @@ steps:
           - "x-pack/osquerybeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/osquerybeat: Windows 2019 Unit Tests"
+              context: "x-pack/osquerybeat: Win 2019 Unit Tests"
 
-  - group: "x-pack/osquerybeat Extended Tests"
+  - group: "Extended Tests"
     key: "x-pack-osquerybeat-extended-tests"
-    if: build.env("BUILDKITE_PULL_REQUEST") == "false"  || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
+    if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
 
     steps:
-      - label: ":mac: x-pack/osquerybeat macOS x86_64 Unit Tests"
+      - label: ":mac: x-pack/osquerybeat: macOS x86_64 Unit Tests"
         command: |
           set -euo pipefail
           source .buildkite/scripts/install_macos_tools.sh
@@ -225,7 +226,7 @@ steps:
           - github_commit_status:
               context: "x-pack/osquerybeat: macOS x86_64 Unit Tests"
 
-      - label: ":mac: x-pack/osquerybeat macOS arm64 Unit Tests"
+      - label: ":mac: x-pack/osquerybeat: macOS arm64 Unit Tests"
         command: |
           set -euo pipefail
           source .buildkite/scripts/install_macos_tools.sh
@@ -251,7 +252,7 @@ steps:
     depends_on:
       - step: "x-pack-osquerybeat-mandatory-tests"
 
-  - group: "x-pack/osquerybeat Packaging"
+  - group: "Packaging"
     key: "x-pack-querybeat-packaging"
     steps:
       - label: ":ubuntu: Packaging Linux"
diff --git a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml
index 1430cbe37bf..55f944352aa 100644
--- a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml
@@ -27,10 +27,11 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "x-pack/packetbeat Check/Update"
+  - group: "Check/Update"
     key: "x-pack-packetbeat-check-update"
+
     steps:
-      - label: "Run check/update"
+      - label: "x-pack/packetbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C x-pack/packetbeat check update
@@ -46,19 +47,19 @@ steps:
         notify:
           - github_commit_status:
               context: "x-pack/packetbeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
     # this allows building DRA artifacts even if there is flakiness in check/update step
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "x-pack-packetbeat-check-update"
-    
-  - group: "x-pack/packetbeat Mandatory Tests"
+
+  - group: "Mandatory Tests"
     key: "x-pack-packetbeat-mandatory-tests"
 
     steps:
-      - label: ":ubuntu: x-pack/packetbeat Linux x86_64 Unit Tests"
+      - label: ":ubuntu: x-pack/packetbeat: Ubuntu x86_64 Unit Tests"
         key: "mandatory-linux-unit-test"
         command: |
           cd x-pack/packetbeat
@@ -75,9 +76,9 @@ steps:
           - "x-pack/packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/packetbeat: Linux x86_64 Unit Tests"
+              context: "x-pack/packetbeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":ubuntu: x-pack/packetbeat Linux x86_64 System Tests"
+      - label: ":ubuntu: x-pack/packetbeat: Ubuntu x86_64 System Tests"
         key: "mandatory-linux-system-test"
         command: |
           cd x-pack/packetbeat
@@ -94,9 +95,9 @@ steps:
           - "x-pack/packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/packetbeat: Linux x86_64 System Tests"
+              context: "x-pack/packetbeat: Ubuntu x86_64 System Tests"
 
-      - label: ":rhel: x-pack/packetbeat RHEL9 Unit Tests"
+      - label: ":rhel: x-pack/packetbeat: RHEL9 Unit Tests"
         key: "mandatory-rhel9-unit-test"
         command: |
           cd x-pack/packetbeat
@@ -115,7 +116,7 @@ steps:
           - github_commit_status:
               context: "x-pack/packetbeat: RHEL9 Unit Tests"
 
-      - label: ":windows: x-pack/packetbeat Win-2016 Unit Tests"
+      - label: ":windows: x-pack/packetbeat: Win 2016 Unit Tests"
         command: |
           Set-Location -Path x-pack/packetbeat
           mage build unitTest
@@ -134,9 +135,9 @@ steps:
           - "x-pack/packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/packetbeat: Win-2016 Unit Tests"
+              context: "x-pack/packetbeat: Win 2016 Unit Tests"
 
-      - label: ":windows: x-pack/packetbeat Win-2022 Unit Tests"
+      - label: ":windows: x-pack/packetbeat: Win 2022 Unit Tests"
         command: |
           Set-Location -Path x-pack/packetbeat
           mage build unitTest
@@ -155,9 +156,9 @@ steps:
           - "x-pack/packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/packetbeat: Win-2022 Unit Tests"
+              context: "x-pack/packetbeat: Win 2022 Unit Tests"
 
-      - label: ":windows: x-pack/packetbeat Win-2022 System Tests"
+      - label: ":windows: x-pack/packetbeat: Win 2022 System Tests"
         key: "mandatory-win-2022-system-tests"
         skip: "skipping due to elastic/beats#38142"
         command: |
@@ -177,14 +178,14 @@ steps:
           - "x-pack/packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/packetbeat: Win-2022 System Tests"
+              context: "x-pack/packetbeat: Win 2022 System Tests"
 
-  - group: "x-pack/packetbeat Extended Windows Tests"
+  - group: "Extended Windows Tests"
     key: "x-pack-packetbeat-extended-win-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
 
     steps:
-      - label: ":windows: x-pack/packetbeat Win 10 Unit Tests"
+      - label: ":windows: x-pack/packetbeat: Win 10 Unit Tests"
         command: |
           Set-Location -Path x-pack/packetbeat
           mage build unitTest
@@ -205,7 +206,7 @@ steps:
           - github_commit_status:
               context: "x-pack/packetbeat: Win 10 Unit Tests"
 
-      - label: ":windows: x-pack/packetbeat Win 11 Unit Tests"
+      - label: ":windows: x-pack/packetbeat: Win 11 Unit Tests"
         command: |
           Set-Location -Path x-pack/packetbeat
           mage build unitTest
@@ -226,7 +227,7 @@ steps:
           - github_commit_status:
               context: "x-pack/packetbeat: Win 11 Unit Tests"
 
-      - label: ":windows: x-pack/packetbeat Win-2019 Unit Tests"
+      - label: ":windows: x-pack/packetbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path x-pack/packetbeat
           mage build unitTest
@@ -245,9 +246,9 @@ steps:
           - "x-pack/packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/packetbeat: Win-2019 Unit Tests"
+              context: "x-pack/packetbeat: Win 2019 Unit Tests"
 
-      - label: ":windows: x-pack/packetbeat Win 10 System Tests"
+      - label: ":windows: x-pack/packetbeat: Win 10 System Tests"
         key: "extended-win-10-system-tests"
         skip: "skipping due to elastic/beats#38142"
         command: |
@@ -269,12 +270,12 @@ steps:
           - github_commit_status:
               context: "x-pack/packetbeat: Win 10 System Tests"
 
-  - group: "x-pack/packetbeat Extended Tests"
+  - group: "Extended Tests"
     key: "x-pack-packetbeat-extended-linux-arm-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm).*/
 
     steps:
-      - label: ":ubuntu: x-pack/packetbeat Linux arm64 Unit Tests"
+      - label: ":ubuntu: x-pack/packetbeat: Ubuntu arm64 Unit Tests"
         key: "extended-arm64-unit-test"
         if: build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
         command: |
@@ -292,9 +293,9 @@ steps:
           - "x-pack/packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/packetbeat: Linux arm64 Unit Tests"
+              context: "x-pack/packetbeat: Ubuntu arm64 Unit Tests"
 
-      - label: ":mac: x-pack/packetbeat macOS Unit Tests"
+      - label: ":mac: x-pack/packetbeat: macOS x86_64 Unit Tests"
         key: "extended-macos-unit-tests"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
@@ -313,9 +314,9 @@ steps:
           - "x-pack/packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/packetbeat: macOS Unit Tests"
+              context: "x-pack/packetbeat: macOS x86_64 Unit Tests"
 
-      - label: ":mac: x-pack/packetbeat macOS arm64 Unit Tests"
+      - label: ":mac: x-pack/packetbeat: macOS arm64 Unit Tests"
         key: "macos-arm64-unit-tests-extended"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
@@ -336,7 +337,7 @@ steps:
           - github_commit_status:
               context: "x-pack/packetbeat: macOS arm64 Unit Tests"
 
-  - group: "x-pack/packetbeat Packaging"
+  - group: "Packaging"
     key: "x-pack-packetbeat-packaging"
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on:
@@ -344,7 +345,7 @@ steps:
         allow_failure: false
 
     steps:
-      - label: ":ubuntu: x-pack/packetbeat Packaging Linux"
+      - label: ":ubuntu: x-pack/packetbeat: Packaging Linux"
         key: "packaging-linux"
         command: |
           cd x-pack/packetbeat
@@ -365,7 +366,7 @@ steps:
           - github_commit_status:
               context: "x-pack/packetbeat: Packaging Linux"
 
-      - label: ":ubuntu: x-pack/packetbeat Packaging arm64"
+      - label: ":ubuntu: x-pack/packetbeat: Packaging arm64"
         key: "packaging-arm"
         command: |
           cd x-pack/packetbeat
diff --git a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
index 8903ccadefc..fc561ef2fae 100644
--- a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
@@ -19,10 +19,10 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "x-pack/winlogbeat Check/Update"
+  - group: "Check/Update"
     key: "x-pack-winlogbeat-check-update"
     steps:
-      - label: "Run check/update"
+      - label: "x-pack/winlogbeat: Run check/update"
         command: |
           set -eo pipefail
           make -C x-pack/winlogbeat check update
@@ -38,7 +38,7 @@ steps:
         notify:
           - github_commit_status:
               context: "x-pack/winlogbeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
@@ -46,10 +46,11 @@ steps:
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
     depends_on: "x-pack-winlogbeat-check-update"
 
-  - group: "x-pack/winlogbeat Mandatory Tests"
+  - group: "Mandatory Tests"
     key: "x-pack-winlogbeat-mandatory-tests"
+
     steps:
-      - label: ":windows: x-pack/winlogbeat Win-2019 Unit (MODULE) Tests"
+      - label: ":windows: x-pack/winlogbeat Win 2019 Unit (MODULE) Tests"
         key: "mandatory-win-2019-module-unit-tests"
         command: |
           Import-Module ./.buildkite/scripts/changesets.psm1
@@ -71,9 +72,9 @@ steps:
           - "x-pack/winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/winlogbeat Win-2019 Unit (MODULE) Tests"
+              context: "x-pack/winlogbeat Win 2019 Unit (MODULE) Tests"
 
-      - label: ":windows: x-pack/winlogbeat Win-2016 Unit Tests"
+      - label: ":windows: x-pack/winlogbeat: Win 2016 Unit Tests"
         command: |
           Set-Location -Path x-pack/winlogbeat
           mage build unitTest
@@ -92,9 +93,9 @@ steps:
           - "x-pack/winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/winlogbeat Win-2016 Unit Tests"
+              context: "x-pack/winlogbeat: Win 2016 Unit Tests"
 
-      - label: ":windows: x-pack/winlogbeat Win-2022 Unit Tests"
+      - label: ":windows: x-pack/winlogbeat: Win 2022 Unit Tests"
         command: |
           Set-Location -Path x-pack/winlogbeat
           mage build unitTest
@@ -113,14 +114,14 @@ steps:
           - "x-pack/winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/winlogbeat Win-2022 Unit Tests"
+              context: "x-pack/winlogbeat: Win 2022 Unit Tests"
 
   - group: "Extended Windows Tests"
     key: "extended-win-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
 
     steps:
-      - label: ":windows: x-pack/winlogbeat Win 10 Unit Tests"
+      - label: ":windows: x-pack/winlogbeat: Win 10 Unit Tests"
         command: |
           Set-Location -Path x-pack/winlogbeat
           mage build unitTest
@@ -139,9 +140,9 @@ steps:
           - "x-pack/winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/winlogbeat Win 10 Unit Tests"
+              context: "x-pack/winlogbeat: Win 10 Unit Tests"
 
-      - label: ":windows: x-pack/winlogbeat Win 11 Unit Tests"
+      - label: ":windows: x-pack/winlogbeat: Win 11 Unit Tests"
         command: |
           Set-Location -Path x-pack/winlogbeat
           mage build unitTest
@@ -160,9 +161,9 @@ steps:
           - "x-pack/winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/winlogbeat Win 11 Unit Tests"
+              context: "x-pack/winlogbeat: Win 11 Unit Tests"
 
-      - label: ":windows: x-pack/winlogbeat Win-2019 Unit Tests"
+      - label: ":windows: x-pack/winlogbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path x-pack/winlogbeat
           mage build unitTest
@@ -181,7 +182,7 @@ steps:
           - "x-pack/winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/winlogbeat: Win-2019 Unit Tests"
+              context: "x-pack/winlogbeat: Win 2019 Unit Tests"
 
   - wait: ~
     # with PRs, we want to run packaging only if mandatory tests succeed
@@ -191,11 +192,11 @@ steps:
     depends_on:
       - "x-pack-winlogbeat-mandatory-tests"
 
-  - group: "x-pack/winlogbeat Packaging"
+  - group: "Packaging"
     key: "x-pack-winlogbeat-packaging"
 
     steps:
-      - label: ":ubuntu: x-pack/winlogbeat Packaging Linux"
+      - label: ":ubuntu: x-pack/winlogbeat: Packaging Linux"
         key: "packaging-linux"
         command: "cd x-pack/winlogbeat && mage package"
         retry:
@@ -212,4 +213,4 @@ steps:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         notify:
           - github_commit_status:
-              context: "x-pack/winlogbeat Packaging Linux"
+              context: "x-pack/winlogbeat: Packaging Linux"