diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
index 0d4e455e41b..d969c27c7d7 100644
--- a/.buildkite/heartbeat/heartbeat-pipeline.yml
+++ b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -26,6 +26,33 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
+  - group: "Heartbeat Check/Update"
+    key: "heartbeat-check-update"
+    
+    steps:
+      - label: "Run check/update"
+        command: |
+          make -C heartbeat check update
+          make check-no-changes
+        retry:
+          automatic:
+            - limit: 3
+        agents:
+          image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
+          cpu: "4000m"
+          memory: "8Gi"
+          useCustomGlobalHooks: true
+        notify:
+          - github_commit_status:
+              context: "hearbeat: check/update"
+      
+  - wait: ~
+    # with PRs, we want to run mandatory tests only if check/update step succeed
+    # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
+    # this allows building DRA artifacts even if there is flakiness in check/update step
+    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
+    depends_on: "heartbeat-check-update"
+
   - group: "Heartbeat Mandatory Testing"
     key: "heartbeat-mandatory-tests"
 
diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml
index ed9fb14f3d4..cf46aebd5b7 100644
--- a/.buildkite/metricbeat/pipeline.yml
+++ b/.buildkite/metricbeat/pipeline.yml
@@ -2,7 +2,8 @@
 name: "beats-metricbeat"
 
 env:
-  AWS_ARM_INSTANCE_TYPE: "t4g.xlarge"
+  AWS_ARM_INSTANCE_TYPE: "m6g.xlarge"
+  AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64"
 
   GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8"
   GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
@@ -10,7 +11,6 @@ env:
 
   IMAGE_MACOS_ARM: "generic-13-ventura-arm"
   IMAGE_MACOS_X86_64: "generic-13-ventura-x64"
-  IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64"
   IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"
   IMAGE_WIN_10: "family/platform-ingest-beats-windows-10"
   IMAGE_WIN_11: "family/platform-ingest-beats-windows-11"
@@ -30,12 +30,41 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
+  - group: "Metricbeat Check/Update"
+    key: "metricbeat-check-update"
+    steps:
+      - label: "Run check/update"
+        command: |
+          make -C metricbeat check update
+          make check-no-changes
+        retry:
+          automatic:
+            - limit: 3
+        agents:
+          image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
+          cpu: "4000m"
+          memory: "8Gi"
+          useCustomGlobalHooks: true
+        notify:
+          - github_commit_status:
+              context: "metricbeat: check/update"
+      
+  - wait: ~
+    # with PRs, we want to run mandatory tests only if check/update step succeed
+    # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
+    # this allows building DRA artifacts even if there is flakiness in check/update step
+    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
+    depends_on: "metricbeat-check-update"
+
   - group: "Metricbeat Mandatory Tests"
     key: "metricbeat-mandatory-tests"
+
     steps:
-      - label: ":linux: Ubuntu Unit Tests"
+      - label: ":ubuntu: Metricbeat Unit Tests"
         key: "mandatory-linux-unit-test"
-        command: "cd metricbeat && mage build unitTest"
+        command: |
+          cd metricbeat
+          mage build unitTest
         retry:
           automatic:
             - limit: 3
@@ -48,27 +77,20 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: Ubuntu Unit Tests"
+              context: "metricbeat: Linux x86_64 Unit Tests"
 
-      - label: ":go: Go Integration Tests"
+      - label: ":ubuntu: Metricbeat Go Integration Tests"
         key: "mandatory-int-test"
         command: |
           set -euo pipefail
           # defines the MODULE env var based on what's changed in a PR
           source .buildkite/scripts/changesets.sh
           defineModuleFromTheChangeSet metricbeat
-          echo "~~~ Running tests"
-
-          # TODO move this section to base image / pre-command hook
-          echo "~~~ Installing kind"
-          asdf plugin add kind
-          asdf install kind $ASDF_KIND_VERSION
-
-          .buildkite/deploy/kubernetes/scripts/kind-setup.sh
 
           echo "~~~ Running tests"
           export KUBECONFIG="$$PWD/kubecfg"
-          cd metricbeat && mage goIntegTest
+          cd metricbeat
+          mage goIntegTest
         retry:
           automatic:
             - limit: 3
@@ -83,25 +105,18 @@ steps:
           - github_commit_status:
               context: "metricbeat: Go Integration Tests"
 
-      - label: ":python: Python Integration Tests"
+      - label: ":ubuntu: Metricbeat Python Integration Tests"
         key: "mandatory-python-int-test"
         command: |
           set -euo pipefail
           # defines the MODULE env var based on what's changed in a PR
           source .buildkite/scripts/changesets.sh
           defineModuleFromTheChangeSet metricbeat
-          echo "~~~ Running tests"
-
-          # TODO move this section to base image / pre-command hook
-          echo "~~~ Installing kind"
-          asdf plugin add kind
-          asdf install kind $ASDF_KIND_VERSION
-
-          .buildkite/deploy/kubernetes/scripts/kind-setup.sh
 
           echo "~~~ Running tests"
           export KUBECONFIG="$$PWD/kubecfg"
-          cd metricbeat && mage pythonIntegTest
+          cd metricbeat
+          mage pythonIntegTest
         retry:
           automatic:
             - limit: 3
@@ -116,7 +131,7 @@ steps:
           - github_commit_status:
               context: "metricbeat: Python Integration Tests"
 
-      - label: ":negative_squared_cross_mark: Cross compile"
+      - label: ":ubuntu: Metricbeat Crosscompile"
         key: "mandatory-cross-compile"
         command: "make -C metricbeat crosscompile"
         retry:
@@ -131,9 +146,9 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: Cross compile"
+              context: "metricbeat: Crosscompile"
 
-      - label: ":windows: Windows 2016 Unit Tests"
+      - label: ":windows: Metricbeat Win-2016 Unit Tests"
         command: |
           Set-Location -Path metricbeat
           mage build unitTest
@@ -152,9 +167,9 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: Windows 2016 Unit Tests"
+              context: "metricbeat: Win-2016 Unit Tests"
 
-      - label: ":windows: Windows 2022 Unit Tests"
+      - label: ":windows: Metricbeat Win-2022 Unit Tests"
         command: |
           Set-Location -Path metricbeat
           mage build unitTest
@@ -173,13 +188,14 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: Windows 2022 Unit Tests"
+              context: "metricbeat: Win-2022 Unit Tests"
 
   - group: "Metricbeat Extended Windows Tests"
     key: "metricbeat-extended-win-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
+
     steps:
-      - label: ":windows: Windows 10 Unit Tests"
+      - label: ":windows: Metricbeat Win 10 Unit Tests"
         command: |
           Set-Location -Path metricbeat
           mage build unitTest
@@ -198,9 +214,9 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: Extended Windows 10 Unit Tests"
+              context: "metricbeat: Win 10 Unit Tests"
 
-      - label: ":windows: Windows 11 Unit Tests"
+      - label: ":windows: Metricbeat Win 11 Unit Tests"
         command: |
           Set-Location -Path metricbeat
           mage build unitTest
@@ -219,9 +235,9 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: Extended Windows 11 Unit Tests"
+              context: "metricbeat: Win 11 Unit Tests"
 
-      - label: ":windows: Windows 2019 Unit Tests"
+      - label: ":windows: Metricbeat Win-2019 Unit Tests"
         command: |
           Set-Location -Path metricbeat
           mage build unitTest
@@ -240,18 +256,20 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: Extended Windows 2019 Unit Tests"
+              context: "metricbeat: Win-2019 Unit Tests"
 
-  - group: "Metricbeat Extended MacOS Tests"
+  - group: "Metricbeat Extended macOS Tests"
     key: "metricbeat-extended-macos-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
+
     steps:
-      - label: ":mac: MacOS x64_64 Unit Tests"
+      - label: ":mac: Metricbeat macOS x64_64 Unit Tests"
         key: "extended-macos-x64-64-unit-tests"
         command: |
           set -euo pipefail
           source .buildkite/scripts/install_macos_tools.sh
-          cd metricbeat && mage build unitTest
+          cd metricbeat
+          mage build unitTest
         retry:
           automatic:
             - limit: 3
@@ -263,15 +281,17 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: Extended MacOS x86_64 Unit Tests"
+              context: "metricbeat: macOS x86_64 Unit Tests"
 
-      - label: ":mac: MacOS arm64 Unit Tests"
+      - label: ":mac: Metricbeat macOS arm64 Unit Tests"
         key: "extended-macos-arm64-unit-tests"
-        skip: "due to https://github.com/elastic/beats/issues/33035"
+        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
+          cd metricbeat
+          mage build unitTest
         retry:
           automatic:
             - limit: 3
@@ -283,7 +303,7 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: Extended MacOS arm64 Unit Tests"
+              context: "metricbeat: macOS arm64 Unit Tests"
 
   - wait: ~
     # with PRs, we want to run packaging only if mandatory tests succeed
@@ -295,9 +315,11 @@ steps:
   - group: "Metricbeat Packaging"
     key: "metricbeat-packaging"
     steps:
-      - label: ":linux: Packaging Linux"
+      - label: ":ubuntu: Metricbeat Packaging Linux"
         key: "packaging-linux"
-        command: "cd metricbeat && mage package"
+        command: |
+          cd metricbeat
+          mage package
         retry:
           automatic:
             - limit: 3
@@ -314,20 +336,22 @@ steps:
           - github_commit_status:
               context: "metricbeat: Packaging Linux"
 
-      - label: ":linux: Packaging ARM"
+      - label: ":ubuntu: Metricbeat Packaging Linux arm64"
         key: "packaging-arm"
-        command: "cd metricbeat && mage package"
+        command: |
+          cd metricbeat
+          mage package
         retry:
           automatic:
             - limit: 3
         timeout_in_minutes: 20
         agents:
           provider: "aws"
-          imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
+          imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
           instanceType: "${AWS_ARM_INSTANCE_TYPE}"
         env:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
         notify:
           - github_commit_status:
-              context: "metricbeat: Packaging Linux ARM"
+              context: "metricbeat: Packaging Linux arm64"
diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
index 4d8e468595d..c53e60f3654 100644
--- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml
+++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
@@ -25,8 +25,9 @@ env:
 steps:
   - group: "Winlogbeat Check/Update"
     key: "winlogbeat-check-update"
+
     steps:
-      - label: "Run check/update"
+      - label: "Winlogbeat Run check/update"
         command: |
           make -C winlogbeat check update
           make check-no-changes
@@ -41,7 +42,7 @@ steps:
         notify:
           - github_commit_status:
               context: "winlogbeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
@@ -68,7 +69,7 @@ steps:
           - "winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "Winlogbeat: Crosscompile"
+              context: "winlogbeat: Crosscompile"
 
       - label: ":windows: Winlogbeat Win-2016 Unit Tests"
         command: |
@@ -89,7 +90,7 @@ steps:
           - "winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "Winlogbeat: Win-2016 Unit Tests"
+              context: "winlogbeat: Win-2016 Unit Tests"
 
       - label: ":windows: Winlogbeat Win-2019 Unit Tests"
         command: |
@@ -110,7 +111,7 @@ steps:
           - "winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "Winlogbeat: Win-2019 Unit Tests"
+              context: "winlogbeat: Win-2019 Unit Tests"
 
       - label: ":windows: Winlogbeat Win-2022 Unit Tests"
         command: |
@@ -157,7 +158,7 @@ steps:
           - "winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "Winlogbeat: Win-10 Unit Tests"
+              context: "winlogbeat: Win-10 Unit Tests"
 
       - label: ":windows: Winlogbeat Win-11 Unit Tests"
         command: |
@@ -178,7 +179,7 @@ steps:
           - "winlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "Winlogbeat: Win-11 Unit Tests"
+              context: "winlogbeat: Win-11 Unit Tests"
 
   - wait: ~
     if: build.env("BUILDKITE_PULL_REQUEST") != "false"
@@ -187,7 +188,7 @@ steps:
   - group: "Winlogbeat Packaging"
     key: "winlogbeat-packaging"
     steps:
-      - label: ":ubuntu: Winlogbeat Packaging Ubuntu x86_64"
+      - label: ":ubuntu: Winlogbeat Packaging Linux"
         key: "packaging-linux"
         command: |
           cd winlogbeat
@@ -204,4 +205,4 @@ steps:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         notify:
           - github_commit_status:
-              context: "Winlogbeat: Packaging Ubuntu x86_64"
+              context: "winlogbeat: Packaging Linux"
diff --git a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
index 415c3947874..bdfe4c9dde6 100644
--- a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
@@ -18,6 +18,32 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
+  - group: "x-pack/dockerlogbeat Check/Update"
+    key: "x-pack-dockerlogbeat-check-update"
+    steps:
+      - label: "Run check/update"
+        command: |
+          make -C x-pack/dockerlogbeat check update
+          make check-no-changes
+        retry:
+          automatic:
+            - limit: 3
+        agents:
+          image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
+          cpu: "4000m"
+          memory: "8Gi"
+          useCustomGlobalHooks: true
+        notify:
+          - github_commit_status:
+              context: "x-pack/dockerlogbeat: check/update"
+      
+  - wait: ~
+    # with PRs, we want to run mandatory tests only if check/update step succeed
+    # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
+    # this allows building DRA artifacts even if there is flakiness in check/update step
+    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
+    depends_on: "x-pack-dockerlogbeat-check-update"
+
   - group: "x-pack/dockerlogbeat Mandatory Tests"
     key: "xpack-dockerlogbeat-mandatory-tests"
     steps:
diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
index 3a833f369e2..1431cb20a51 100644
--- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
@@ -31,6 +31,33 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
+  - group: "x-pack/heartbeat Check/Update"
+    key: "x-pack-heartbeat-check-update"
+    
+    steps:
+      - label: "Run check/update"
+        command: |
+          make -C x-pack/heartbeat check update
+          make check-no-changes
+        retry:
+          automatic:
+            - limit: 3
+        agents:
+          image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
+          cpu: "4000m"
+          memory: "8Gi"
+          useCustomGlobalHooks: true
+        notify:
+          - github_commit_status:
+              context: "x-pack/heartbeat: check/update"
+      
+  - wait: ~
+    # with PRs, we want to run mandatory tests only if check/update step succeed
+    # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
+    # this allows building DRA artifacts even if there is flakiness in check/update step
+    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
+    depends_on: "x-pack-heartbeat-check-update"
+
   - group: "x-pack/heartbeat Mandatory Tests"
     key: "x-pack-heartbeat-mandatory-tests"
     steps:
diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
index 324678acbda..9f8b2ae0c72 100644
--- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
@@ -26,6 +26,32 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
+  - group: "x-pack/metricbeat Check/Update"
+    key: "x-pack-metricbeat-check-update"
+    steps:
+      - label: "Run check/update"
+        command: |
+          make -C x-pack/metricbeat check update
+          make check-no-changes
+        retry:
+          automatic:
+            - limit: 3
+        agents:
+          image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
+          cpu: "4000m"
+          memory: "8Gi"
+          useCustomGlobalHooks: true
+        notify:
+          - github_commit_status:
+              context: "x-pack/metricbeat: check/update"
+      
+  - wait: ~
+    # with PRs, we want to run mandatory tests only if check/update step succeed
+    # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
+    # this allows building DRA artifacts even if there is flakiness in check/update step
+    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
+    depends_on: "x-pack-metricbeat-check-update"
+
   - group: "x-pack/metricbeat Mandatory Tests"
     key: "x-pack-metricbeat-mandatory-tests"
     steps:
diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
index cf8dab2de8b..5d3bc1285ff 100644
--- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
@@ -23,6 +23,32 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
+  - group: "x-pack/osquerybeat Check/Update"
+    key: "x-pack-osquerybeat-check-update"
+    steps:
+      - label: "Run check/update"
+        command: |
+          make -C x-pack/osquerybeat check update
+          make check-no-changes
+        retry:
+          automatic:
+            - limit: 3
+        agents:
+          image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
+          cpu: "4000m"
+          memory: "8Gi"
+          useCustomGlobalHooks: true
+        notify:
+          - github_commit_status:
+              context: "x-pack/osquerybeat: check/update"
+      
+  - wait: ~
+    # with PRs, we want to run mandatory tests only if check/update step succeed
+    # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
+    # this allows building DRA artifacts even if there is flakiness in check/update step
+    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
+    depends_on: "x-pack-osquerybeat-check-update"
+
   - group: "x-pack/osquerybeat Mandatory Tests"
     key: "x-pack-osquerybeat-mandatory-tests"
 
diff --git a/.github/workflows/check-metricbeat.yml b/.github/workflows/check-metricbeat.yml
deleted file mode 100644
index 709fa3a44bd..00000000000
--- a/.github/workflows/check-metricbeat.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: check-metricbeat
-
-on:
-  pull_request:
-    paths:
-      - '.github/workflows/check-metricbeat.yml'
-      - 'metricbeat/**'
-      - 'x-pack/metricbeat/**'
-
-env:
-  BEAT_MODULE: 'metricbeat'
-
-permissions:
-  contents: read
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-go@v3
-      with:
-        go-version-file: .go-version
-    - name: Run check/update
-      run: |
-        go install github.com/magefile/mage
-        make -C ${{ env.BEAT_MODULE }} check update
-        make check-no-changes
diff --git a/.github/workflows/check-xpack-heartbeat.yml b/.github/workflows/check-xpack-heartbeat.yml
deleted file mode 100644
index 3d6be31ef8b..00000000000
--- a/.github/workflows/check-xpack-heartbeat.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: check-x-pack-heartbeat
-
-on:
-  pull_request:
-    paths:
-      - '.github/workflows/check-xpack-heartbeat.yml'
-      - 'x-pack/heartbeat/**'
-      - 'heartbeat/**'
-
-env:
-  BEAT_MODULE: 'x-pack/heartbeat'
-
-permissions:
-  contents: read
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-go@v3
-      with:
-        go-version-file: .go-version
-    - name: Run check/update
-      run: |
-        go install github.com/magefile/mage
-        make -C ${{ env.BEAT_MODULE }} check update
-        make check-no-changes
diff --git a/catalog-info.yaml b/catalog-info.yaml
index 4c16ed63739..97e7871f768 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -982,6 +982,54 @@ spec:
         everyone:
           access_level: BUILD_AND_READ
 
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: buildkite-pipeline-beats-xpack-agentbeat
+  description: "Beats x-pack agentbeat pipeline"
+  links:
+    - title: Pipeline
+      url: https://buildkite.com/elastic/beats-xpack-agentbeat
+
+spec:
+  type: buildkite-pipeline
+  owner: group:ingest-fp
+  system: buildkite
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: beats-xpack-agentbeat
+      description: "Beats x-pack agentbeat pipeline"
+    spec:
+      # branch_configuration: "main 8.*"         #TODO: uncomment after tests
+      pipeline_file: ".buildkite/x-pack/pipeline.xpack.agentbeat.yml"
+      maximum_timeout_in_minutes: 120
+      provider_settings:
+        trigger_mode: none # don't trigger jobs from github activity
+        build_pull_request_forks: false
+        build_pull_requests: true # requires filter_enabled and filter_condition settings as below when used with buildkite-pr-bot
+        build_tags: true
+        filter_enabled: true
+        filter_condition: >-
+          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 !8.*"
+      skip_intermediate_builds: true
+      skip_intermediate_builds_branch_filter: "!main !8.*"
+      env:
+        # TODO set to true once https://github.com/elastic/ingest-dev/issues/3001 has been resolved
+        ELASTIC_PR_COMMENTS_ENABLED: "false"
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: BUILD_AND_READ
+
+
 ---
 # yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
 apiVersion: backstage.io/v1alpha1
diff --git a/libbeat/docs/repositories.asciidoc b/libbeat/docs/repositories.asciidoc
index e3640f62ef1..848cfafea45 100644
--- a/libbeat/docs/repositories.asciidoc
+++ b/libbeat/docs/repositories.asciidoc
@@ -151,7 +151,7 @@ To add the {repo} repository for YUM:
 +
 [source,sh]
 --------------------------------------------------
-sudo rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch
+sudo rpm --import https://artifacts.elastic.co/GPG-KEY-elasticsearch
 --------------------------------------------------
 
 . Create a file with a `.repo` extension (for example, `elastic.repo`) in
diff --git a/libbeat/tests/system/requirements_aix.txt b/libbeat/tests/system/requirements_aix.txt
deleted file mode 100644
index 87133cda11d..00000000000
--- a/libbeat/tests/system/requirements_aix.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-requests==2.31.0
-urllib3==1.26.18
-docker==6.1.3
-docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix
-async-timeout==4.0.3
-attrs==19.3.0
-autopep8==1.5.4
-backoff==2.2.1
-backports.ssl-match-hostname==3.5.0.1
-bcrypt==4.1.2
-cached-property==1.4.2
-certifi==2023.7.22
-cffi==1.16.0
-chardet==3.0.4
-charset-normalizer==3.3.2
-cryptography==42.0.4
-deepdiff==4.2.0
-Deprecated==1.2.14
-distro==1.9.0
-docker-pycreds==0.4.0
-dockerpty==0.4.1
-docopt==0.6.2
-elasticsearch==7.8.1
-enum34==1.1.6
-exceptiongroup==1.2.0
-googleapis-common-protos==1.56.4
-grpcio==1.60.0
-idna==2.6
-importlib-metadata==1.7.0
-iniconfig==1.0.1
-ipaddress==1.0.19
-Jinja2==3.1.3
-jsondiff==1.1.2
-jsonschema==3.2.0
-kafka-python==1.4.3
-MarkupSafe==2.1.3
-more-itertools==8.4.0
-opentelemetry-api==1.13.0
-opentelemetry-exporter-otlp==1.13.0
-opentelemetry-exporter-otlp-proto-grpc==1.13.0
-opentelemetry-exporter-otlp-proto-http==1.13.0
-opentelemetry-proto==1.13.0
-opentelemetry-sdk==1.13.0
-opentelemetry-semantic-conventions==0.34b0
-ordered-set==3.1.1
-packaging==20.4
-parameterized==0.7.0
-paramiko==3.4.0
-pluggy==0.13.1
-protobuf==3.19.5
-py==1.11.0
-pycodestyle==2.6.0
-pycparser==2.21
-PyNaCl==1.5.0
-pyparsing==2.4.7
-pyrsistent==0.16.0
-pytest==7.3.2
-pytest-rerunfailures==9.1.1
-pytest-timeout==1.4.2
-python-dotenv==0.21.1
-PyYAML==5.3.1
-redis==4.4.4
-semver==2.8.1
-six==1.15.0
-stomp.py==4.1.22
-termcolor==1.1.0
-texttable==0.9.1
-toml==0.10.1
-tomli==2.0.1
-typing_extensions==4.9.0
-wcwidth==0.2.5
-websocket-client==0.47.0
-wrapt==1.16.0
-zipp==3.1.0
diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml
index 05ba6d0a25c..9c201081660 100644
--- a/testing/environments/snapshot.yml
+++ b/testing/environments/snapshot.yml
@@ -3,7 +3,7 @@
 version: '2.3'
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0-d4efed09-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0-3854513c-SNAPSHOT
     # When extend is used it merges healthcheck.tests, see:
     # https://github.com/docker/compose/issues/8962
     # healthcheck:
@@ -31,7 +31,7 @@ services:
     - "./docker/elasticsearch/users_roles:/usr/share/elasticsearch/config/users_roles"
 
   logstash:
-    image: docker.elastic.co/logstash/logstash:8.15.0-d4efed09-SNAPSHOT
+    image: docker.elastic.co/logstash/logstash:8.15.0-3854513c-SNAPSHOT
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
       retries: 600
@@ -44,7 +44,7 @@ services:
       - 5055:5055
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.15.0-d4efed09-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.15.0-3854513c-SNAPSHOT
     environment:
     - "ELASTICSEARCH_USERNAME=kibana_system_user"
     - "ELASTICSEARCH_PASSWORD=testing"
diff --git a/x-pack/packetbeat/magefile.go b/x-pack/packetbeat/magefile.go
index 357e5e23585..7e2c70d2f84 100644
--- a/x-pack/packetbeat/magefile.go
+++ b/x-pack/packetbeat/magefile.go
@@ -173,10 +173,7 @@ func SystemTest(ctx context.Context) error {
 }
 
 func getBucketName() string {
-	if os.Getenv("BUILDKITE") == "true" {
-		return "ingest-buildkite-ci"
-	}
-	return "obs-ci-cache"
+	return "ingest-buildkite-ci"
 }
 
 // getNpcapInstaller gets the installer from the Google Cloud Storage service.