diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
index 4d8e468595d..c53e60f3654 100644
--- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml
+++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
@@ -25,8 +25,9 @@ env:
 steps:
   - group: "Winlogbeat Check/Update"
     key: "winlogbeat-check-update"
+
     steps:
-      - label: "Run check/update"
+      - label: "Winlogbeat Run check/update"
         command: |
           make -C winlogbeat check update
           make check-no-changes
@@ -41,7 +42,7 @@ steps:
         notify:
           - github_commit_status:
               context: "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
@@ -68,7 +69,7 @@ steps:
           - "winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "Winlogbeat: Crosscompile"
+              context: "winlogbeat: Crosscompile"
 
       - label: ":windows: Winlogbeat Win-2016 Unit Tests"
         command: |
@@ -89,7 +90,7 @@ 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"
         command: |
@@ -110,7 +111,7 @@ 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"
         command: |
@@ -157,7 +158,7 @@ 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"
         command: |
@@ -178,7 +179,7 @@ steps:
           - "winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "Winlogbeat: Win-11 Unit Tests"
+              context: "winlogbeat: Win-11 Unit Tests"
 
   - wait: ~
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
@@ -187,7 +188,7 @@ steps:
   - group: "Winlogbeat Packaging"
     key: "winlogbeat-packaging"
     steps:
-      - label: ":ubuntu: Winlogbeat Packaging Ubuntu x86_64"
+      - label: ":ubuntu: Winlogbeat Packaging Linux"
         key: "packaging-linux"
         command: |
           cd winlogbeat
@@ -204,4 +205,4 @@ steps:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         notify:
           - github_commit_status:
-              context: "Winlogbeat: Packaging Ubuntu x86_64"
+              context: "winlogbeat: Packaging Linux"