diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 01f62733cb1d..eea60dcca412 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -353,9 +353,9 @@ steps:
                 #OSS
                 - go.mod
                 - pytest.ini
-                - dev-tools/**
-                - libbeat/**
-                - testing/**
+                - dev-tools/
+                - libbeat/
+                - testing/
               config:
                 trigger: "beats-winlogbeat"
                 build:
diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh
index c665dc72b280..faee83486d3b 100755
--- a/.buildkite/scripts/common.sh
+++ b/.buildkite/scripts/common.sh
@@ -54,6 +54,10 @@ xpack_packetbeat_changeset=(
   "^x-pack/packetbeat/.*"
   )
 
+xpack_winlogbeat_changeset=(
+  "^x-pack/winlogbeat/.*"
+  )
+
 ci_changeset=(
   "^.buildkite/.*"
   )
diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
index b8064a2a82b7..c71858b45b0a 100644
--- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml
+++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
@@ -89,11 +89,12 @@ steps:
           - github_commit_status:
               context: "Winlogbeat: Win-2022 Unit Tests"
 
-  - group: "Extended Windows Tests"
+  - group: "Winlogbeat 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 Wind-10 Unit Tests"
+      - label: ":windows: Winlogbeat Win-10 Unit Tests"
         command: |
           Set-Location -Path winlogbeat
           mage build unitTest
@@ -130,15 +131,17 @@ steps:
               context: "Winlogbeat: Win-11 Unit Tests"
 
   - wait: ~
-    depends_on:
-      - step: "winlogbeat-mandatory-tests"
+    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
+    depends_on: "winlogbeat-mandatory-tests"
 
   - group: "Winlogbeat Packaging"
     key: "winlogbeat-packaging"
     steps:
       - label: ":ubuntu: Winlogbeat Packaging Ubuntu x86_64"
         key: "packaging-linux"
-        command: "cd winlogbeat && mage package"
+        command: |
+          cd winlogbeat
+          mage package
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"