diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
index 2dc75406a9d2..848f9a6bae58 100644
--- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
@@ -28,8 +28,9 @@ env:
 steps:
   - group: "x-pack/metricbeat Mandatory Tests"
     key: "x-pack-metricbeat-mandatory-tests"
+
     steps:
-      - label: ":linux: Ubuntu Unit Tests"
+      - label: ":ubuntu: x-pack/metricbeat Linux x86_64 Unit Tests"
         key: "mandatory-linux-unit-test"
         command: |
           cd x-pack/metricbeat
@@ -46,9 +47,9 @@ steps:
           - "x-pack/metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/metricbeat: Ubuntu Unit Tests"
+              context: "x-pack/metricbeat: Linux x86_64 Unit Tests"
 
-      - label: ":go: Go (MODULE) Integration Tests"
+      - label: ":ubuntu: x-pack/metricbeat Go (MODULE) Integration Tests"
         key: "mandatory-int-test"
         command: |
           set -euo pipefail
@@ -71,7 +72,7 @@ steps:
           - github_commit_status:
               context: "x-pack/metricbeat: Go (MODULE) Integration Tests"
 
-      - label: ":python: Python (MODULE) Integration Tests"
+      - label: ":ubuntu: x-pack/metricbeat Python (MODULE) Integration Tests"
         key: "mandatory-python-int-test"
         command: |
           set -euo pipefail
@@ -94,7 +95,7 @@ steps:
           - github_commit_status:
               context: "x-pack/metricbeat: Python (MODULE) Integration Tests"
 
-      - label: ":windows: Windows 2019 Unit Tests"
+      - label: ":windows: x-pack/metricbeat Win-2019 Unit Tests"
         command: |
           Set-Location -Path x-pack/metricbeat
           mage build unitTest
@@ -113,14 +114,14 @@ steps:
           - "x-pack/metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/metricbeat: Windows 2019 Unit Tests"
+              context: "x-pack/metricbeat: Win-2019 Unit Tests"
 
   - group: "x-pack/metricbeat 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: Windows 2016 Unit Tests"
+      - label: ":windows: x-pack/metricbeat Win-2016 Unit Tests"
         command: |
           Set-Location -Path x-pack/metricbeat
           mage build unitTest
@@ -139,9 +140,9 @@ steps:
           - "x-pack/metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/metricbeat: Windows 2016 Unit Tests"
+              context: "x-pack/metricbeat: Win-2016 Unit Tests"
 
-      - label: ":windows: Windows 10 Unit Tests"
+      - label: ":windows: x-pack/metricbeat Win 10 Unit Tests"
         command: |
           Set-Location -Path x-pack/metricbeat
           mage build unitTest
@@ -160,13 +161,14 @@ steps:
           - "x-pack/metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/metricbeat: Windows 10 Unit Tests"
+              context: "x-pack/metricbeat: Win 10 Unit Tests"
 
   - group: "x-pack/metricbeat 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: 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
@@ -183,9 +185,9 @@ steps:
           - "x-pack/metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/metricbeat: MacOS x86_64 Unit Tests"
+              context: "x-pack/metricbeat: macOS x86_64 Unit Tests"
 
-      - label: ":linux: Cloud (MODULE) Tests"
+      - label: ":ubuntu: x-pack/metricbeat Cloud (MODULE) Tests"
         key: "x-pack-metricbeat-extended-cloud-test"
         if: build.env("GITHUB_PR_LABELS") =~ /.*aws.*/
         command: |
@@ -213,9 +215,9 @@ steps:
           - github_commit_status:
               context: "x-pack/metricbeat: Cloud (MODULE) Tests"
 
-      - label: ":linux: Cloud AWS (MODULE) Tests"
+      - label: ":ubuntu: x-pack/metricbeat Cloud AWS (MODULE) Tests"
         key: "x-pack-metricbeat-extended-cloud-test-aws"
-        skip: "Skipping due elastic/beats#36425 & elastic/ingest-dev#3170"
+#        skip: "Skipping due elastic/beats#36425 & elastic/ingest-dev#3170"
         # https://github.com/elastic/beats/issues/36425 & https://github.com/elastic/ingest-dev/issues/3170
         if: build.env("GITHUB_PR_LABELS") =~ /.*aws.*/
         command: |
@@ -255,7 +257,7 @@ steps:
   - group: "x-pack/metricbeat Packaging"
     key: "x-pack-metricbeat-packaging"
     steps:
-      - label: ":linux: Packaging Linux"
+      - label: ":ubuntu: x-pack/metricbeat Packaging Linux"
         key: "packaging-linux"
         command: |
           cd x-pack/metricbeat
@@ -276,7 +278,7 @@ steps:
           - github_commit_status:
               context: "x-pack/metricbeat: Packaging Linux"
 
-      - label: ":linux: Packaging ARM"
+      - label: ":ubuntu: x-pack/metricbeat Packaging arm64"
         key: "packaging-arm"
         command: |
           cd x-pack/metricbeat
@@ -294,4 +296,4 @@ steps:
           PACKAGES: "docker"
         notify:
           - github_commit_status:
-              context: "x-pack/metricbeat: Packaging Linux ARM"
+              context: "x-pack/metricbeat: Packaging Linux arm64"