diff --git a/.buildkite/macos-tests-pipeline.yml b/.buildkite/macos-tests-pipeline.yml
index 94f3f00248a4..f910f4f119a3 100644
--- a/.buildkite/macos-tests-pipeline.yml
+++ b/.buildkite/macos-tests-pipeline.yml
@@ -13,15 +13,564 @@ env:
   RACE_DETECTOR: "true"
   TEST_COVERAGE: "true"
 
+  # Concurrency definition
+  CONCURRENCY_GROUP: "orka-concurrency-group"
+  CONCURRENCY_COUNT: 10
+  CONCURRENCY_METHOD: eager
+
 steps:
-  - label: ":mac: Auditbeat: macOS x86_64 Unit Tests"
-    command: echo "test!"
-    retry:
-      automatic:
-        - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
-    agents:
-      provider: "orka"
-      imagePrefix: "${IMAGE_MACOS_X86_64}"
-    artifact_paths:
-      - "auditbeat/build/*.xml"
-      - "auditbeat/build/*.json"
+  - group: "Auditbeat macOS Tests"
+    steps:
+      - label: ":mac: Auditbeat: macOS x86_64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd auditbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_X86_64}"
+        artifact_paths:
+          - "auditbeat/build/*.xml"
+          - "auditbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "auditbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+      - label: ":mac: Auditbeat: macOS arm64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd auditbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_ARM}"
+        artifact_paths:
+          - "auditbeat/build/*.xml"
+          - "auditbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "auditbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+  - group: "Filebeat macOS Tests"
+    steps:
+      - label: ":mac: Filebeat: macOS x86_64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd filebeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_X86_64}"
+        artifact_paths:
+          - "filebeat/build/*.xml"
+          - "filebeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "filebeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+      - label: ":mac: Filebeat: macOS arm64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd filebeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_ARM}"
+        artifact_paths:
+          - "filebeat/build/*.xml"
+          - "filebeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "filebeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+  - group: "Heartbeat macOS Tests"
+    steps:
+      - label: ":mac: Heartbeat: macOS x86_64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd heartbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_X86_64}"
+        artifact_paths:
+          - "metricbeat/build/*.xml"
+          - "metricbeat/build/*.json"
+
+      - label: ":mac: Heartbeat: macOS arm64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd heartbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_ARM}"
+        artifact_paths:
+          - "metricbeat/build/*.xml"
+          - "metricbeat/build/*.json"
+
+  - group: "Metricbeat macOS Tests"
+    steps:
+      - label: ":mac: Metricbeat: macOS x64_64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd metricbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_X86_64}"
+        artifact_paths:
+          - "metricbeat/build/*.xml"
+          - "metricbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "metricbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+      - label: ":mac: Metricbeat: macOS arm64 Unit Tests"
+        skip: "Skipping due to elastic/beats#33035"
+        # https://github.com/elastic/beats/issues/33035
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd metricbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_ARM}"
+        artifact_paths:
+          - "metricbeat/build/*.xml"
+          - "metricbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "metricbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+  - group: "Packetbeat macOS Tests"
+    steps:
+      - label: ":mac: Packetbeat: macOS x86_64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd packetbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_X86_64}"
+        artifact_paths:
+          - "packetbeat/build/*.xml"
+          - "packetbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "packetbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+      - label: ":mac: Packetbeat: macOS arm64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd packetbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_ARM}"
+        artifact_paths:
+          - "packetbeat/build/*.xml"
+          - "packetbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "packetbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+  - group: "x-pack/auditbeat macOS Tests"
+    steps:
+      - label: ":mac: x-pack/auditbeat: macOS x86_64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd x-pack/auditbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_X86_64}"
+        artifact_paths:
+          - "x-pack/auditbeat/build/*.xml"
+          - "x-pack/auditbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "x-pack/auditbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+      - label: ":mac: x-pack/auditbeat: macOS arm64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd x-pack/auditbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_ARM}"
+        artifact_paths:
+          - "x-pack/auditbeat/build/*.xml"
+          - "x-pack/auditbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "x-pack/auditbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+  - group: "x-pack/filebeat macOS Tests"
+    steps:
+      - label: ":mac: x-pack/filebeat: macOS x86_64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd x-pack/filebeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_X86_64}"
+        artifact_paths:
+          - "x-pack/filebeat/build/*.xml"
+          - "x-pack/filebeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "x-pack/filebeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+      - label: ":mac: x-pack/filebeat: macOS arm64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd x-pack/filebeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_ARM}"
+        artifact_paths:
+          - "x-pack/filebeat/build/*.xml"
+          - "x-pack/filebeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "x-pack/filebeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+  - group: "x-pack/heartbeat macOS Tests"
+    steps:
+      - label: ":mac: x-pack/heartbeat: macOS x86_64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          withNodeJSEnv $ASDF_NODEJS_VERSION
+          installNodeJsDependencies
+          cd x-pack/heartbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_X86_64}"
+        artifact_paths:
+          - "x-pack/heartbeat/build/*.xml"
+          - "x-pack/heartbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "x-pack/heartbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+      - label: ":mac: x-pack/heartbeat: macOS arm64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          withNodeJSEnv $ASDF_NODEJS_VERSION
+          installNodeJsDependencies
+          cd x-pack/heartbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_ARM}"
+        artifact_paths:
+          - "x-pack/heartbeat/build/*.xml"
+          - "x-pack/heartbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "x-pack/heartbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+  - group: "x-pack/metricbeat macOS Tests"
+    steps:
+      - label: ":mac: x-pack/metricbeat: macOS x86_64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd x-pack/metricbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_X86_64}"
+        artifact_paths:
+          - "x-pack/metricbeat/build/*.xml"
+          - "x-pack/metricbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "x-pack/metricbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+      - label: ":mac: x-pack/metricbeat: macOS arm64 Unit Tests"
+        skip: "Skipping due to elastic/beats#33036 & elastic/beats#40496"
+        # https://github.com/elastic/beats/issues/33036 https://github.com/elastic/beats/issues/40496
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd x-pack/metricbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_ARM}"
+        artifact_paths:
+          - "x-pack/metricbeat/build/*.xml"
+          - "x-pack/metricbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "x-pack/metricbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+  - group: "x-pack/osquerybeat macOS Tests"
+    steps:
+      - label: ":mac: x-pack/osquerybeat: macOS x86_64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd x-pack/osquerybeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_X86_64}"
+        artifact_paths:
+          - "x-pack/osquerybeat/build/*.xml"
+          - "x-pack/osquerybeat/build/*.json"
+
+      - label: ":mac: x-pack/osquerybeat: macOS arm64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd x-pack/osquerybeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_ARM}"
+        artifact_paths:
+          - "x-pack/osquerybeat/build/*.xml"
+          - "x-pack/osquerybeat/build/*.json"
+
+  - group: "x-pack/packetbeat macOS Tests"
+    steps:
+      - label: ":mac: x-pack/packetbeat: macOS x86_64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd x-pack/packetbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_X86_64}"
+        artifact_paths:
+          - "x-pack/packetbeat/build/*.xml"
+          - "x-pack/packetbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "x-pack/packetbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
+
+      - label: ":mac: x-pack/packetbeat: macOS arm64 Unit Tests"
+        command: |
+          set -euo pipefail
+          source .buildkite/scripts/install_macos_tools.sh
+          cd x-pack/packetbeat
+          mage build unitTest
+        concurrency_group: "${CONCURRENCY_GROUP}"
+        concurrency: "${CONCURRENCY_COUNT}"
+        concurrency_method: "${CONCURRENCY_METHOD}"
+        retry:
+          automatic:
+            - limit: 3  # using higher retries for now due to lack of custom vm images and vendor instability
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_ARM}"
+        artifact_paths:
+          - "x-pack/packetbeat/build/*.xml"
+          - "x-pack/packetbeat/build/*.json"
+        plugins:
+          - test-collector#v1.10.2:
+              files: "x-pack/packetbeat/build/TEST-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
diff --git a/catalog-info.yaml b/catalog-info.yaml
index d4a48a5a1aae..00a212b6295b 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -1175,6 +1175,11 @@ spec:
       cancel_intermediate_builds: false
       provider_settings:
         trigger_mode: none
+      schedules:
+        Weekly main:
+          branch: main
+          cronline: 0 0 * * 0
+          message: Weekly build of macOS tests
       teams:
         ingest-fp:
           access_level: MANAGE_BUILD_AND_READ
@@ -1220,12 +1225,6 @@ spec:
           message: Daily trigger of Beats AWS tests
           env:
             PIPELINES_TO_TRIGGER: 'beats-aws-tests'
-        Weekly run of macOS tests:
-          branch: main
-          cronline: 0 0 * * 0
-          message: Weekly trigger of Beats macOS tests
-          env:
-            PIPELINES_TO_TRIGGER: 'beats-macos-tests'
       skip_intermediate_builds: true
       provider_settings:
         trigger_mode: none