diff --git a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
index 068ac73e1f5..c14efffd837 100644
--- a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
@@ -3,7 +3,6 @@ name: "beats-xpack-winlogbeat"
 
 env:
   IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"
-
   IMAGE_WIN_10: "family/platform-ingest-beats-windows-10"
   IMAGE_WIN_11: "family/platform-ingest-beats-windows-11"
   IMAGE_WIN_2016: "family/platform-ingest-beats-windows-2016"
@@ -20,10 +19,10 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
-  - group: "x-pack/Winlogbeat Mandatory Tests"
+  - group: "x-pack/winlogbeat 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
@@ -45,9 +44,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-2022 Unit Tests"
+      - label: ":windows: x-pack/winlogbeat Win-2022 Unit Tests"
         command: |
           Set-Location -Path x-pack/winlogbeat
           mage build unitTest
@@ -66,14 +65,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"
+  - group: "x-pack/winlogbeat 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-2016 Unit Tests"
+      - label: ":windows: x-pack/winlogbeat Win-2016 Unit Tests"
         command: |
           Set-Location -Path x-pack/winlogbeat
           mage build unitTest
@@ -89,9 +88,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-10 Unit Tests"
+      - label: ":windows: x-pack/winlogbeat Win 10 Unit Tests"
         command: |
           Set-Location -Path x-pack/winlogbeat
           mage build unitTest
@@ -110,30 +109,9 @@ steps:
           - "x-pack/winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/Winlogbeat Win-10 Unit Tests"
-
-      - label: ":windows: x-pack/Winlogbeat Win-11 Unit Tests"
-        command: |
-          Set-Location -Path x-pack/winlogbeat
-          mage build unitTest
-        key: "extended-win-11-unit-tests"
-        retry:
-          automatic:
-            - limit: 3
-        agents:
-          provider: "gcp"
-          image: "${IMAGE_WIN_11}"
-          machineType: "${GCP_WIN_MACHINE_TYPE}"
-          disk_size: 100
-          disk_type: "pd-ssd"
-        artifact_paths:
-          - "x-pack/winlogbeat/build/*.xml"
-          - "x-pack/winlogbeat/build/*.json"
-        notify:
-          - github_commit_status:
-              context: "x-pack/Winlogbeat Win-11 Unit Tests"
+              context: "x-pack/winlogbeat Win 10 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
@@ -162,11 +140,11 @@ steps:
     depends_on:
       - "x-pack-winlogbeat-mandatory-tests"
 
-  - group: "x-pack/Winlogbeat Packaging"
+  - group: "x-pack/winlogbeat Packaging"
     key: "x-pack-winlogbeat-packaging"
 
     steps:
-      - label: ":ubuntu: Packaging Linux"
+      - label: ":ubuntu: x-pack/winlogbeat Packaging Linux"
         key: "packaging-linux"
         command: "cd x-pack/winlogbeat && mage package"
         retry:
@@ -183,4 +161,4 @@ steps:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
         notify:
           - github_commit_status:
-              context: "x-pack/Winlogbeat Packaging"
+              context: "x-pack/winlogbeat Packaging Linux"