diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml
index c7dcc01e625e..2ec8ef4f3233 100644
--- a/.buildkite/metricbeat/pipeline.yml
+++ b/.buildkite/metricbeat/pipeline.yml
@@ -24,26 +24,25 @@ env:
   ASDF_MAGE_VERSION: 1.15.0
 
 steps:
-
   - input: "Input Parameters"
     key: "run_metricbeat"
     fields:
-    - select: "Metricbeat - run_metricbeat"
-      key: "run_metricbeat"
-      options:
-        - label: "True"
-          value: "true"
-        - label: "False"
-          value: "false"
-      default: "false"
-    - select: "Metricbeat - run_metricbeat_macos_tests"
-      key: "run_metricbeat_macos_tests"
-      options:
-        - label: "True"
-          value: "true"
-        - label: "False"
-          value: "false"
-      default: "false"
+      - select: "Metricbeat - run_metricbeat"
+        key: "run_metricbeat"
+        options:
+          - label: "True"
+            value: "true"
+          - label: "False"
+            value: "false"
+        default: "false"
+      - select: "Metricbeat - run_metricbeat_macos_tests"
+        key: "run_metricbeat_macos_tests"
+        options:
+          - label: "True"
+            value: "true"
+          - label: "False"
+            value: "false"
+        default: "false"
     if: "build.source == 'ui'"
 
   - wait: ~
diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml
index 9247b1446676..82630978bd3a 100644
--- a/.buildkite/packetbeat/pipeline.packetbeat.yml
+++ b/.buildkite/packetbeat/pipeline.packetbeat.yml
@@ -25,34 +25,33 @@ env:
   ASDF_MAGE_VERSION: 1.15.0
 
 steps:
-
   - input: "Input Parameters"
     key: "input-run-all-stages"
     fields:
-    - select: "Packetbeat - run_packetbeat"
-      key: "run_packetbeat"
-      options:
-        - label: "True"
-          value: "true"
-        - label: "False"
-          value: "false"
-      default: "false"
-    - select: "Packetbeat - run_packetbeat_arm_tests"
-      key: "run_packetbeat_arm_tests"
-      options:
-        - label: "True"
-          value: "true"
-        - label: "False"
-          value: "false"
-      default: "false"
-    - select: "Packetbeat - run_packetbeat_macos_tests"
-      key: "run_packetbeat_macos_tests"
-      options:
-        - label: "True"
-          value: "true"
-        - label: "False"
-          value: "false"
-      default: "false"
+      - select: "Packetbeat - run_packetbeat"
+        key: "run_packetbeat"
+        options:
+          - label: "True"
+            value: "true"
+          - label: "False"
+            value: "false"
+        default: "false"
+      - select: "Packetbeat - run_packetbeat_arm_tests"
+        key: "run_packetbeat_arm_tests"
+        options:
+          - label: "True"
+            value: "true"
+          - label: "False"
+            value: "false"
+        default: "false"
+      - select: "Packetbeat - run_packetbeat_macos_tests"
+        key: "run_packetbeat_macos_tests"
+        options:
+          - label: "True"
+            value: "true"
+          - label: "False"
+            value: "false"
+        default: "false"
     if: "build.source == 'ui'"
 
   - wait: ~
diff --git a/.buildkite/scripts/generate_metricbeat_pipeline.sh b/.buildkite/scripts/generate_metricbeat_pipeline.sh
index a0386aeb1b75..f419f330f63f 100755
--- a/.buildkite/scripts/generate_metricbeat_pipeline.sh
+++ b/.buildkite/scripts/generate_metricbeat_pipeline.sh
@@ -75,28 +75,41 @@ steps:
           - github_commit_status:
               context: "$BEATS_PROJECT_NAME: Cross compile"
 
-      - label: ":windows: Windows 2016/2022 Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 2016 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "mandatory-win-unit-tests"
+        key: "mandatory-win-2016-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
+          image: "${IMAGE_WIN_2016}"
           machine_type: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_2016}"
-              - "${IMAGE_WIN_2022}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2016 Unit Tests"
+
+      - label: ":windows: Windows 2022 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "mandatory-win-2022-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_2022}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 2022 Unit Tests"
 
 # echo "Add the extended windows tests into the pipeline"
 # TODO: ADD conditions from the main pipeline
@@ -104,29 +117,59 @@ steps:
   - group: "Extended Windows Tests"
     key: "extended-win-tests"
     steps:
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 10 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-10-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_10}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 10 Unit Tests"
+
+      - label: ":windows: Windows 11 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-11-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_11}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 11 Unit Tests"
+
+      - label: ":windows: Windows 2019 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "extended-win-unit-tests"
+        key: "extended-win-2019-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
+          image: "${IMAGE_WIN_2019}"
           machineType: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_10}"
-              - "${IMAGE_WIN_11}"
-              - "${IMAGE_WIN_2019}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2019 Unit Tests"
 
 YAML
 else
diff --git a/.buildkite/scripts/generate_packetbeat_pipeline.sh b/.buildkite/scripts/generate_packetbeat_pipeline.sh
index e4870437ac16..2a5011e46ac9 100755
--- a/.buildkite/scripts/generate_packetbeat_pipeline.sh
+++ b/.buildkite/scripts/generate_packetbeat_pipeline.sh
@@ -43,56 +43,98 @@ steps:
           - github_commit_status:
               context: "$BEATS_PROJECT_NAME: RHEL9 Unit Tests"
 
+      - label: ":windows: Windows 2016 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "mandatory-win-2016-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_2016}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 2016 Unit Tests"
 
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 2022 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "mandatory-win-unit-tests"
+        key: "mandatory-win-2022-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
-          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          image: "${IMAGE_WIN_2022}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_2016}"
-              - "${IMAGE_WIN_2022}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2022 Unit Tests"
 
   - group: "Extended Windowds Tests"
     key: "extended-win-tests"
     steps:
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 10 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-10-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_10}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 10 Unit Tests"
+
+      - label: ":windows: Windows 11 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-11-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_11}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 11 Unit Tests"
+
+      - label: ":windows: Windows 2019 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "extended-win-unit-tests"
+        key: "extended-win-2019-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
+          image: "${IMAGE_WIN_2019}"
           machineType: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_10}"
-              - "${IMAGE_WIN_11}"
-              - "${IMAGE_WIN_2019}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2019 Unit Tests"
 
 YAML
 else
diff --git a/.buildkite/scripts/generate_winlogbeat_pipeline.sh b/.buildkite/scripts/generate_winlogbeat_pipeline.sh
index ede70538c2c5..62fe899c5dd9 100755
--- a/.buildkite/scripts/generate_winlogbeat_pipeline.sh
+++ b/.buildkite/scripts/generate_winlogbeat_pipeline.sh
@@ -30,29 +30,59 @@ steps:
           - github_commit_status:
               context: "$BEATS_PROJECT_NAME: Cross compile"
 
-      - label: ":windows: Windows 2016/2019/2022 Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 2016 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "mandatory-win-unit-tests"
+        key: "mandatory-win-2016-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
+          image: "${IMAGE_WIN_2016}"
           machine_type: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_2016}"
-              - "${IMAGE_WIN_2019}"
-              - "${IMAGE_WIN_2022}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2016 Unit Tests"
+
+      - label: ":windows: Windows 2019 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "mandatory-win-2019-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_2019}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 2019 Unit Tests"
+
+      - label: ":windows: Windows 2022 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "mandatory-win-2022-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_2022}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 2022 Unit Tests"
 
 # echo "Add the extended windows tests into the pipeline"
 # TODO: ADD conditions from the main pipeline
@@ -60,28 +90,41 @@ steps:
   - group: "Extended Windows Tests"
     key: "extended-win-tests"
     steps:
-      - label: ":windows: Windows 10/11 Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 10 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-10-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_10}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 10 Unit Tests"
+
+      - label: ":windows: Windows 11 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "extended-win-unit-tests"
+        key: "extended-win-11-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
+          image: "${IMAGE_WIN_11}"
           machineType: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_10}"
-              - "${IMAGE_WIN_11}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 11 Unit Tests"
 
 YAML
 else
diff --git a/.buildkite/scripts/generate_xpack_auditbeat_pipeline.sh b/.buildkite/scripts/generate_xpack_auditbeat_pipeline.sh
index eb9c8269f3db..f1b40d992d75 100755
--- a/.buildkite/scripts/generate_xpack_auditbeat_pipeline.sh
+++ b/.buildkite/scripts/generate_xpack_auditbeat_pipeline.sh
@@ -46,59 +46,100 @@ steps:
           - github_commit_status:
               context: "$BEATS_PROJECT_NAME: RHEL9 Unit Tests"
 
+      - label: ":windows: Windows 2016 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "mandatory-win-2016-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_2016}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 2016 Unit Tests"
 
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 2022 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "mandatory-win-unit-tests"
+        key: "mandatory-win-2022-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
-          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          image: "${IMAGE_WIN_2022}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_2016}"
-              - "${IMAGE_WIN_2022}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2022 Unit Tests"
 
 ## TODO: this condition will be changed in the Phase 3 of the Migration Plan https://docs.google.com/document/d/1IPNprVtcnHlem-uyGZM0zGzhfUuFAh4LeSl9JFHMSZQ/edit#heading=h.sltz78yy249h
 
   - group: "Extended Windows Tests"
     key: "extended-win-tests"
     steps:
+      - label: ":windows: Windows 10 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-10-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_10}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 10 Unit Tests"
+
+      - label: ":windows: Windows 11 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-11-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_11}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 11 Unit Tests"
 
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 2019 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "extended-win-unit-tests"
+        key: "extended-win-2019-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
+          image: "${IMAGE_WIN_2019}"
           machineType: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_10}"
-              - "${IMAGE_WIN_11}"
-              - "${IMAGE_WIN_2019}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2019 Unit Tests"
 
 YAML
 else
diff --git a/.buildkite/scripts/generate_xpack_dockerlogbeat_pipeline.sh b/.buildkite/scripts/generate_xpack_dockerlogbeat_pipeline.sh
index f9ca4e7f7677..bf8908cb609b 100755
--- a/.buildkite/scripts/generate_xpack_dockerlogbeat_pipeline.sh
+++ b/.buildkite/scripts/generate_xpack_dockerlogbeat_pipeline.sh
@@ -29,7 +29,6 @@ steps:
           - github_commit_status:
               context: "$BEATS_PROJECT_NAME: Ubuntu Unit Tests"
 
-
       - label: ":go: Go Integration Tests"
         key: "mandatory-int-test"
         command: "cd $BEATS_PROJECT_NAME && mage goIntegTest"
diff --git a/.buildkite/scripts/generate_xpack_filebeat_pipeline.sh b/.buildkite/scripts/generate_xpack_filebeat_pipeline.sh
index 78a351a078d9..7e3e4aa5f39c 100755
--- a/.buildkite/scripts/generate_xpack_filebeat_pipeline.sh
+++ b/.buildkite/scripts/generate_xpack_filebeat_pipeline.sh
@@ -59,58 +59,100 @@ steps:
           - github_commit_status:
               context: "$BEATS_PROJECT_NAME: Python Integration Tests"
 
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 2016 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "mandatory-win-unit-tests"
+        key: "mandatory-win-2016-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
-          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          image: "${IMAGE_WIN_2016}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_2016}"
-              - "${IMAGE_WIN_2022}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2016 Unit Tests"
+
+      - label: ":windows: Windows 2022 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "mandatory-win-2022-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_2022}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 2022 Unit Tests"
 
 ## TODO: this condition will be changed in the Phase 3 of the Migration Plan https://docs.google.com/document/d/1IPNprVtcnHlem-uyGZM0zGzhfUuFAh4LeSl9JFHMSZQ/edit#heading=h.sltz78yy249h
 
   - group: "Extended Windows Tests"
     key: "extended-win-tests"
     steps:
+      - label: ":windows: Windows 10 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-10-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_10}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 10 Unit Tests"
+
+      - label: ":windows: Windows 11 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-11-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_11}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 11 Unit Tests"
 
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 2019 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "extended-win-unit-tests"
+        key: "extended-win-2019-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
+          image: "${IMAGE_WIN_2019}"
           machineType: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_10}"
-              - "${IMAGE_WIN_11}"
-              - "${IMAGE_WIN_2019}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2019 Unit Tests"
 
 YAML
 else
diff --git a/.buildkite/scripts/generate_xpack_heartbeat_pipeline.sh b/.buildkite/scripts/generate_xpack_heartbeat_pipeline.sh
index f940789abfee..94eed4f7c6a7 100755
--- a/.buildkite/scripts/generate_xpack_heartbeat_pipeline.sh
+++ b/.buildkite/scripts/generate_xpack_heartbeat_pipeline.sh
@@ -41,51 +41,101 @@ steps:
           - github_commit_status:
               context: "$BEATS_PROJECT_NAME: Go Integration Tests"
 
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
-        skip: "see elastic/beats#23957 and elastic/beats#23958"
-        command: |
-         Set-Location -Path $BEATS_PROJECT_NAME
-         mage build unitTest
-        key: "mandatory-win-unit-tests"
-        agents:
-         provider: "gcp"
-         image: "{{matrix.image}}"
-         machineType: "${GCP_WIN_MACHINE_TYPE}"
-         disk_size: 100
-         disk_type: "pd-ssd"
-        matrix:
-         setup:
-           image:
-             - "${IMAGE_WIN_2016}"
-             - "${IMAGE_WIN_2022}"
-        artifact_paths:
-         - "$BEATS_PROJECT_NAME/build/*.xml"
-         - "$BEATS_PROJECT_NAME/build/*.json"
+  ####### skip: "see elastic/beats#23957 and elastic/beats#23958"
+  #     - label: ":windows: Windows 2016 Unit Tests"
+  #       command: |
+  #         Set-Location -Path $BEATS_PROJECT_NAME
+  #         mage build unitTest
+  #       key: "mandatory-win-2016-unit-tests"
+  #       agents:
+  #         provider: "gcp"
+  #         image: "${IMAGE_WIN_2016}"
+  #         machine_type: "${GCP_WIN_MACHINE_TYPE}"
+  #         disk_size: 100
+  #         disk_type: "pd-ssd"
+  #       artifact_paths:
+  #         - "$BEATS_PROJECT_NAME/build/*.xml"
+  #         - "$BEATS_PROJECT_NAME/build/*.json"
+  #       notify:
+  #         - github_commit_status:
+  #             context: "$BEATS_PROJECT_NAME: Windows 2016 Unit Tests"
+
+  #     - label: ":windows: Windows 2022 Unit Tests"
+  #       command: |
+  #         Set-Location -Path $BEATS_PROJECT_NAME
+  #         mage build unitTest
+  #       key: "mandatory-win-2022-unit-tests"
+  #       agents:
+  #         provider: "gcp"
+  #         image: "${IMAGE_WIN_2022}"
+  #         machine_type: "${GCP_WIN_MACHINE_TYPE}"
+  #         disk_size: 100
+  #         disk_type: "pd-ssd"
+  #       artifact_paths:
+  #         - "$BEATS_PROJECT_NAME/build/*.xml"
+  #         - "$BEATS_PROJECT_NAME/build/*.json"
+  #       notify:
+  #         - github_commit_status:
+  #             context: "$BEATS_PROJECT_NAME: Windows 2022 Unit Tests"
+
+  # - group: "Extended Windows Tests" ## TODO: this condition will be changed in the Phase 3
+  #   key: "extended-win-tests"
+  #   steps:
+  #     - label: ":windows: Windows 10 Unit Tests"
+  #       command: |
+  #         Set-Location -Path $BEATS_PROJECT_NAME
+  #         mage build unitTest
+  #       key: "extended-win-10-unit-tests"
+  #       agents:
+  #         provider: "gcp"
+  #         image: "${IMAGE_WIN_10}"
+  #         machineType: "${GCP_WIN_MACHINE_TYPE}"
+  #         disk_size: 100
+  #         disk_type: "pd-ssd"
+  #       artifact_paths:
+  #         - "$BEATS_PROJECT_NAME/build/*.xml"
+  #         - "$BEATS_PROJECT_NAME/build/*.json"
+  #       notify:
+  #         - github_commit_status:
+  #             context: "$BEATS_PROJECT_NAME: Windows 10 Unit Tests"
+
+  #     - label: ":windows: Windows 11 Unit Tests"
+  #       command: |
+  #         Set-Location -Path $BEATS_PROJECT_NAME
+  #         mage build unitTest
+  #       key: "extended-win-11-unit-tests"
+  #       agents:
+  #         provider: "gcp"
+  #         image: "${IMAGE_WIN_11}"
+  #         machineType: "${GCP_WIN_MACHINE_TYPE}"
+  #         disk_size: 100
+  #         disk_type: "pd-ssd"
+  #       artifact_paths:
+  #         - "$BEATS_PROJECT_NAME/build/*.xml"
+  #         - "$BEATS_PROJECT_NAME/build/*.json"
+  #       notify:
+  #         - github_commit_status:
+  #             context: "$BEATS_PROJECT_NAME: Windows 11 Unit Tests"
+
+  #     - label: ":windows: Windows 2019 Unit Tests"
+  #       command: |
+  #         Set-Location -Path $BEATS_PROJECT_NAME
+  #         mage build unitTest
+  #       key: "extended-win-2019-unit-tests"
+  #       agents:
+  #         provider: "gcp"
+  #         image: "${IMAGE_WIN_2019}"
+  #         machineType: "${GCP_WIN_MACHINE_TYPE}"
+  #         disk_size: 100
+  #         disk_type: "pd-ssd"
+  #       artifact_paths:
+  #         - "$BEATS_PROJECT_NAME/build/*.xml"
+  #         - "$BEATS_PROJECT_NAME/build/*.json"
+  #       notify:
+  #         - github_commit_status:
+  #             context: "$BEATS_PROJECT_NAME: Windows 2019 Unit Tests"
+  ####### skip: "see elastic/beats#23957 and elastic/beats#23958"
 
-  - group: "Extended Windows Tests" ## TODO: this condition will be changed in the Phase 3
-    key: "extended-win-tests"
-    steps:
-    - label: ":windows: Windows Unit Tests - {{matrix.image}}"
-      skip: "see elastic/beats#23957 and elastic/beats#23958"
-      command: |
-        Set-Location -Path $BEATS_PROJECT_NAME
-        mage build unitTest
-      key: "extended-win-unit-tests"
-      agents:
-        provider: "gcp"
-        image: "{{matrix.image}}"
-        machineType: "${GCP_WIN_MACHINE_TYPE}"
-        disk_size: 100
-        disk_type: "pd-ssd"
-      matrix:
-        setup:
-          image:
-            - "${IMAGE_WIN_10}"
-            - "${IMAGE_WIN_11}"
-            - "${IMAGE_WIN_2019}"
-      artifact_paths:
-        - "$BEATS_PROJECT_NAME/build/*.xml"
-        - "$BEATS_PROJECT_NAME/build/*.json"
 YAML
 else
   echo "The conditions don't match to requirements for generating pipeline steps."
diff --git a/.buildkite/scripts/generate_xpack_libbeat_pipeline.sh b/.buildkite/scripts/generate_xpack_libbeat_pipeline.sh
index 7e3d5086288f..a99564e8613b 100755
--- a/.buildkite/scripts/generate_xpack_libbeat_pipeline.sh
+++ b/.buildkite/scripts/generate_xpack_libbeat_pipeline.sh
@@ -57,56 +57,99 @@ steps:
           - github_commit_status:
               context: "$BEATS_PROJECT_NAME: Python Integration Tests"
 
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 2016 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
-          mage -w reader/etw build goUnitTest
-        key: "mandatory-win-unit-tests"
+          mage -w reader\etw build goUnitTest
+        key: "mandatory-win-2016-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
-          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          image: "${IMAGE_WIN_2016}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 2016 Unit Tests"
+
+      - label: ":windows: Windows 2022 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage -w reader\etw build goUnitTest
+        key: "mandatory-win-2022-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_2022}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_2016}"
-              - "${IMAGE_WIN_2022}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2022 Unit Tests"
 
 ### TODO: this condition will be changed in the Phase 3 of the Migration Plan https://docs.google.com/document/d/1IPNprVtcnHlem-uyGZM0zGzhfUuFAh4LeSl9JFHMSZQ/edit#heading=h.sltz78yy249h
   - group: "Extended Windows Tests"
     key: "extended-win-tests"
     steps:
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 10 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage -w reader\etw build goUnitTest
+        key: "extended-win-10-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_10}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 10 Unit Tests"
+
+      - label: ":windows: Windows 11 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage -w reader\etw build goUnitTest
+        key: "extended-win-11-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_11}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 11 Unit Tests"
+
+      - label: ":windows: Windows 2019 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage -w reader\etw build goUnitTest
-        key: "extended-win-unit-tests"
+        key: "extended-win-2019-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
+          image: "${IMAGE_WIN_2019}"
           machineType: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_10}"
-              - "${IMAGE_WIN_11}"
-              - "${IMAGE_WIN_2019}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2019 Unit Tests"
 
 YAML
 else
diff --git a/.buildkite/scripts/generate_xpack_metricbeat_pipeline.sh b/.buildkite/scripts/generate_xpack_metricbeat_pipeline.sh
index d38c31236562..788cfba1e542 100755
--- a/.buildkite/scripts/generate_xpack_metricbeat_pipeline.sh
+++ b/.buildkite/scripts/generate_xpack_metricbeat_pipeline.sh
@@ -67,56 +67,99 @@ steps:
           - github_commit_status:
               context: "$BEATS_PROJECT_NAME: Python (MODULE) Integration Tests"
 
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 2016 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "mandatory-win-unit-tests"
+        key: "mandatory-win-2016-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
-          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          image: "${IMAGE_WIN_2016}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_2016}"
-              - "${IMAGE_WIN_2022}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2016 Unit Tests"
+
+      - label: ":windows: Windows 2022 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "mandatory-win-2022-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_2022}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 2022 Unit Tests"
 
 ## TODO: this condition will be changed in the Phase 3 of the Migration Plan https://docs.google.com/document/d/1IPNprVtcnHlem-uyGZM0zGzhfUuFAh4LeSl9JFHMSZQ/edit#heading=h.sltz78yy249h
   - group: "Extended Windows Tests"
     key: "extended-win-tests"
     steps:
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 10 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-10-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_10}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 10 Unit Tests"
+
+      - label: ":windows: Windows 11 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-11-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_11}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 11 Unit Tests"
+
+      - label: ":windows: Windows 2019 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "extended-win-unit-tests"
+        key: "extended-win-2019-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
+          image: "${IMAGE_WIN_2019}"
           machineType: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_10}"
-              - "${IMAGE_WIN_11}"
-              - "${IMAGE_WIN_2019}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2019 Unit Tests"
 
 YAML
 else
diff --git a/.buildkite/scripts/generate_xpack_osquerybeat_pipeline.sh b/.buildkite/scripts/generate_xpack_osquerybeat_pipeline.sh
index 5372d7f3faa7..4f1afc440efb 100755
--- a/.buildkite/scripts/generate_xpack_osquerybeat_pipeline.sh
+++ b/.buildkite/scripts/generate_xpack_osquerybeat_pipeline.sh
@@ -43,58 +43,100 @@ steps:
           - github_commit_status:
               context: "$BEATS_PROJECT_NAME: Go Integration Tests"
 
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 2016 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "mandatory-win-unit-tests"
+        key: "mandatory-win-2016-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
-          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          image: "${IMAGE_WIN_2016}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_2016}"
-              - "${IMAGE_WIN_2022}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2016 Unit Tests"
+
+      - label: ":windows: Windows 2022 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "mandatory-win-2022-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_2022}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 2022 Unit Tests"
 
 ## TODO: this condition will be changed in the Phase 3 of the Migration Plan https://docs.google.com/document/d/1IPNprVtcnHlem-uyGZM0zGzhfUuFAh4LeSl9JFHMSZQ/edit#heading=h.sltz78yy249h
 
   - group: "Extended Windows Tests"
     key: "extended-win-tests"
     steps:
+      - label: ":windows: Windows 10 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-10-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_10}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 10 Unit Tests"
+
+      - label: ":windows: Windows 11 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-11-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_11}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 11 Unit Tests"
 
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 2019 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "extended-win-unit-tests"
+        key: "extended-win-2019-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
+          image: "${IMAGE_WIN_2019}"
           machineType: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_10}"
-              - "${IMAGE_WIN_11}"
-              - "${IMAGE_WIN_2019}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2019 Unit Tests"
 
 YAML
 else
diff --git a/.buildkite/scripts/generate_xpack_packetbeat_pipeline.sh b/.buildkite/scripts/generate_xpack_packetbeat_pipeline.sh
index 0655aac059c9..97f37ca734bf 100644
--- a/.buildkite/scripts/generate_xpack_packetbeat_pipeline.sh
+++ b/.buildkite/scripts/generate_xpack_packetbeat_pipeline.sh
@@ -57,30 +57,41 @@ steps:
           - github_commit_status:
               context: "$BEATS_PROJECT_NAME: RHEL9 Unit Tests"
 
+      - label: ":windows: Windows 2016 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "mandatory-win-2016-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_2016}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 2016 Unit Tests"
 
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
-        command:
-          - "Set-Location -Path $BEATS_PROJECT_NAME"
-          - "New-Item -ItemType Directory -Force -Path 'build'"
-          - "mage unitTest"
-        key: "mandatory-win-unit-tests"
+      - label: ":windows: Windows 2022 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "mandatory-win-2022-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
-          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          image: "${IMAGE_WIN_2022}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_2016}"
-              - "${IMAGE_WIN_2022}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2022 Unit Tests"
 
       - label: ":windows: Windows 2022 System Tests"
         skip: "see https://github.com/elastic/beats/issues/38142"
@@ -101,30 +112,59 @@ steps:
   - group: "Extended Windows Tests"
     key: "extended-win-tests"
     steps:
+      - label: ":windows: Windows 10 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-10-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_10}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 10 Unit Tests"
+
+      - label: ":windows: Windows 11 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-11-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_11}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 11 Unit Tests"
 
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 2019 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "extended-win-unit-tests"
+        key: "extended-win-2019-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
+          image: "${IMAGE_WIN_2019}"
           machineType: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_10}"
-              - "${IMAGE_WIN_11}"
-              - "${IMAGE_WIN_2019}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2019 Unit Tests"
 
       - label: ":windows: Windows 10 System Tests"
         skip: "see https://github.com/elastic/beats/issues/38142"
diff --git a/.buildkite/scripts/generate_xpack_winlogbeat_pipeline.sh b/.buildkite/scripts/generate_xpack_winlogbeat_pipeline.sh
index ad5ebd445837..60aff562d177 100755
--- a/.buildkite/scripts/generate_xpack_winlogbeat_pipeline.sh
+++ b/.buildkite/scripts/generate_xpack_winlogbeat_pipeline.sh
@@ -17,7 +17,7 @@ steps:
     steps:
 
       - label: ":windows: Windows 2019 Unit (MODULE) Tests"
-        key: "mandatory-win-2019-unit-tests"
+        key: "mandatory-win-2019-module-unit-tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
@@ -36,28 +36,41 @@ steps:
           - github_commit_status:
               context: "$BEATS_PROJECT_NAME: Windows (MODULE) {{matrix.image}} Unit Tests"
 
-      - label: ":windows: Windows 2016/2022 Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 2016 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "mandatory-win-unit-tests"
+        key: "mandatory-win-2016-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
+          image: "${IMAGE_WIN_2016}"
           machine_type: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_2016}"
-              - "${IMAGE_WIN_2022}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2016 Unit Tests"
+
+      - label: ":windows: Windows 2022 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "mandatory-win-2022-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_2022}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 2022 Unit Tests"
 
 # echo "Add the extended windows tests into the pipeline"
 # TODO: ADD conditions from the main pipeline
@@ -65,30 +78,59 @@ steps:
   - group: "Extended Windows Tests"
     key: "extended-win-tests"
     steps:
+      - label: ":windows: Windows 10 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-10-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_10}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 10 Unit Tests"
 
-      - label: ":windows: Windows Unit Tests - {{matrix.image}}"
+      - label: ":windows: Windows 11 Unit Tests"
         command: |
           Set-Location -Path $BEATS_PROJECT_NAME
           mage build unitTest
-        key: "extended-win-unit-tests"
+        key: "extended-win-11-unit-tests"
         agents:
           provider: "gcp"
-          image: "{{matrix.image}}"
+          image: "${IMAGE_WIN_11}"
+          machineType: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths:
+          - "$BEATS_PROJECT_NAME/build/*.xml"
+          - "$BEATS_PROJECT_NAME/build/*.json"
+        notify:
+          - github_commit_status:
+              context: "$BEATS_PROJECT_NAME: Windows 11 Unit Tests"
+
+      - label: ":windows: Windows 2019 Unit Tests"
+        command: |
+          Set-Location -Path $BEATS_PROJECT_NAME
+          mage build unitTest
+        key: "extended-win-2019-unit-tests"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_2019}"
           machineType: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
-        matrix:
-          setup:
-            image:
-              - "${IMAGE_WIN_10}"
-              - "${IMAGE_WIN_11}"
-              - "${IMAGE_WIN_2019}"
         artifact_paths:
           - "$BEATS_PROJECT_NAME/build/*.xml"
           - "$BEATS_PROJECT_NAME/build/*.json"
         notify:
           - github_commit_status:
-              context: "$BEATS_PROJECT_NAME: Windows {{matrix.image}} Unit Tests"
+              context: "$BEATS_PROJECT_NAME: Windows 2019 Unit Tests"
 
 YAML
 else