diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
index f5ca39b36456..87f56faae8e4 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: |
           make -C auditbeat check update
           make check-no-changes
@@ -46,7 +46,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
@@ -54,11 +54,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
@@ -75,9 +75,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
@@ -94,9 +94,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
@@ -114,9 +114,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
@@ -134,9 +134,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:
@@ -152,12 +152,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: |
@@ -176,9 +176,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: |
@@ -197,9 +197,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: |
@@ -218,9 +218,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
@@ -240,7 +240,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
@@ -260,12 +260,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
@@ -284,9 +284,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
@@ -305,9 +305,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
@@ -326,7 +326,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
@@ -335,10 +335,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"
@@ -359,7 +359,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 849720d1e2df..41b126f43f7a 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: |
           make -C filebeat check update
           make check-no-changes
@@ -45,7 +47,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
@@ -53,10 +55,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
@@ -72,9 +74,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
@@ -90,9 +92,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
@@ -110,7 +112,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
@@ -129,9 +131,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
@@ -150,14 +152,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: |
@@ -178,7 +180,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: |
@@ -199,7 +201,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: |
@@ -217,14 +219,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
@@ -243,9 +245,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
@@ -264,9 +266,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
@@ -285,7 +287,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
@@ -294,10 +296,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
@@ -318,7 +320,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
@@ -336,4 +338,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 d969c27c7d79..2f649e07a0ed 100644
--- a/.buildkite/heartbeat/heartbeat-pipeline.yml
+++ b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -26,9 +26,9 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "Heartbeat Check/Update"
+  - group: "Check/Update"
     key: "heartbeat-check-update"
-    
+
     steps:
       - label: "Run check/update"
         command: |
@@ -45,7 +45,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
@@ -53,11 +53,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
@@ -73,9 +73,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
@@ -91,9 +91,9 @@ steps:
           - "heartbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "heartbeat: Rhel9 Unit Tests"
+              context: "heartbeat: RHEL Unit Tests"
 
-      - label: ":windows: Win-2016 Unit Tests"
+      - label: ":windows: Heartbeat: Win 2016 Unit Tests"
         key: "windows-2016"
         command: |
           Set-Location -Path heartbeat
@@ -111,9 +111,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
@@ -131,9 +131,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"
@@ -160,7 +160,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
@@ -184,12 +184,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: |
@@ -205,9 +205,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: |
@@ -228,7 +228,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: |
@@ -249,12 +249,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
@@ -272,9 +272,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
@@ -292,9 +292,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
@@ -312,7 +312,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
@@ -321,10 +321,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"
@@ -344,7 +344,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 7ebe5d76f988..17fc2c3d3c3a 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,7 +17,7 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "libbeat Check/Update"
+  - group: "Check/Update"
     key: "libbeat-check-update"
     steps:
       - label: "Run check/update"
@@ -34,7 +35,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
@@ -45,7 +46,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
@@ -65,7 +66,7 @@ steps:
           - github_commit_status:
               context: "libbeat: Ununtu Unit Tests"
 
-      - label: ":go: Go Integration Tests"
+      - label: ":ubuntu: Libbeat: Go Integration Tests"
         key: "mandatory-int-test"
         command: |
           set -euo pipefail
@@ -85,7 +86,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
@@ -105,7 +106,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
@@ -123,9 +124,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
@@ -146,8 +147,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
@@ -165,4 +167,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 cf46aebd5b77..d9a5381ea81d 100644
--- a/.buildkite/metricbeat/pipeline.yml
+++ b/.buildkite/metricbeat/pipeline.yml
@@ -30,7 +30,7 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "Metricbeat Check/Update"
+  - group: "Check/Update"
     key: "metricbeat-check-update"
     steps:
       - label: "Run check/update"
@@ -48,7 +48,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
@@ -56,11 +56,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
@@ -77,9 +77,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
@@ -105,7 +105,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
@@ -131,7 +131,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:
@@ -148,7 +148,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
@@ -167,9 +167,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
@@ -188,14 +188,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
@@ -216,7 +216,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
@@ -237,7 +237,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
@@ -256,14 +256,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
@@ -283,7 +283,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
@@ -312,10 +312,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
@@ -336,7 +336,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 40e5f0f4b6fb..a7080367af30 100644
--- a/.buildkite/packetbeat/pipeline.packetbeat.yml
+++ b/.buildkite/packetbeat/pipeline.packetbeat.yml
@@ -25,7 +25,7 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "Packetbeat Check/Update"
+  - group: "Check/Update"
     key: "packetbeat-check-update"
     steps:
       - label: "Run check/update"
@@ -43,7 +43,7 @@ steps:
         notify:
           - github_commit_status:
               context: "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
@@ -51,10 +51,10 @@ 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: ":linux: Ubuntu Unit Tests"
+      - label: ":ubuntu: Packetbeat: Ubuntu x86_64 Unit Tests"
         command: |
           cd packetbeat
           mage build unitTest
@@ -70,9 +70,9 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Ubuntu Unit Tests"
+              context: "packetbeat: Ubuntu x86_64 Unit Tests"
 
-      - label: ":rhel: RHEL9 Unit Tests"
+      - label: ":rhel: Packetbeat: RHEL9 Unit Tests"
         command: |
           cd packetbeat
           mage build unitTest
@@ -90,7 +90,7 @@ steps:
           - github_commit_status:
               context: "packetbeat: RHEL9 Unit Tests"
 
-      - label: ":windows: Windows 2016 Unit Tests"
+      - label: ":windows: Packetbeat: Win 2016 Unit Tests"
         command: |
           Set-Location -Path packetbeat
           mage build unitTest
@@ -108,9 +108,9 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Windows 2016 Unit Tests"
+              context: "packetbeat: Win 2016 Unit Tests"
 
-      - label: ":windows: Windows 2022 Unit Tests"
+      - label: ":windows: Packetbeat: Win 2022 Unit Tests"
         command: |
           Set-Location -Path packetbeat
           mage build unitTest
@@ -128,13 +128,14 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Windows 2022 Unit Tests"
+              context: "packetbeat: Win 2022 Unit 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: Windows 10 Unit Tests"
+      - label: ":windows: Packetbeat: Win 10 Unit Tests"
         command: |
           Set-Location -Path packetbeat
           mage build unitTest
@@ -152,9 +153,9 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Extended Windows 10 Unit Tests"
+              context: "packetbeat: Win 10 Unit Tests"
 
-      - label: ":windows: Windows 11 Unit Tests"
+      - label: ":windows: Packetbeat: Win 11 Unit Tests"
         command: |
           Set-Location -Path packetbeat
           mage build unitTest
@@ -173,9 +174,9 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Extended Windows 11 Unit Tests"
+              context: "packetbeat: Win 11 Unit Tests"
 
-      - label: ":windows: Windows 2019 Unit Tests"
+      - label: ":windows: Packetbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path packetbeat
           mage build unitTest
@@ -194,12 +195,13 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Extended Windows 2019 Unit Tests"
+              context: "packetbeat: Win 2019 Unit Tests"
 
   - group: "Extended Tests"
     key: "extended-tests"
+
     steps:
-      - label: ":mac: 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: |