diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
index b0bd67b036a..5d5d3c35433 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 86c0a59a704..1b59e5140d3 100644
--- a/.buildkite/metricbeat/pipeline.yml
+++ b/.buildkite/metricbeat/pipeline.yml
@@ -28,6 +28,32 @@ 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:
@@ -209,7 +235,7 @@ steps:
           - "metricbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "metricbeat: EmacOS x86_64 Unit Tests"
+              context: "metricbeat: macOS x86_64 Unit Tests"
 
   - wait: ~
     # with PRs, we want to run packaging only if mandatory tests succeed
diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml
index eef5fc15380..c4ff374fdab 100644
--- a/.buildkite/packetbeat/pipeline.packetbeat.yml
+++ b/.buildkite/packetbeat/pipeline.packetbeat.yml
@@ -4,18 +4,18 @@ name: "beats-packetbeat"
 env:
   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"
   GCP_WIN_MACHINE_TYPE: "n2-standard-8"
+
   IMAGE_MACOS_ARM: "generic-13-ventura-arm"
   IMAGE_MACOS_X86_64: "generic-13-ventura-x64"
   IMAGE_RHEL9_X86_64: "family/platform-ingest-beats-rhel-9"
   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"
   IMAGE_WIN_2016: "family/platform-ingest-beats-windows-2016"
   IMAGE_WIN_2019: "family/platform-ingest-beats-windows-2019"
-  IMAGE_WIN_2022: "family/platform-ingest-beats-windows-2022"
 
   #Deps
   ASDF_MAGE_VERSION: 1.15.0
@@ -53,8 +53,9 @@ steps:
 
   - group: "packetbeat Mandatory Tests"
     key: "packetbeat-mandatory-tests"
+
     steps:
-      - label: ":linux: Ubuntu Unit Tests"
+      - label: ":ubuntu: Packetbeat Linux x86_64 Unit Tests"
         command: |
           cd packetbeat
           mage build unitTest
@@ -70,11 +71,13 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Ubuntu Unit Tests"
+              context: "packetbeat: Linux x86_64 Unit Tests"
 
-      - label: ":linux: Ubuntu ARM Unit Tests"
+      - label: ":ubuntu: Packetbeat Linux arm64 Unit Tests"
         key: "linux-arm64-unit-tests"
-        command: "cd packetbeat && mage build unitTest"
+        command: |
+          cd packetbeat
+          mage build unitTest
         retry:
           automatic:
             - limit: 3
@@ -87,9 +90,9 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Ubuntu ARM Unit Tests"
+              context: "packetbeat: Linux arm64 Unit Tests"
 
-      - label: ":windows: Windows 2019 Unit Tests"
+      - label: ":windows: Packetbeat Win-2019 Unit Tests"
         command: |
           Set-Location -Path packetbeat
           mage build unitTest
@@ -107,33 +110,14 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Windows 2019 Unit Tests"
+              context: "packetbeat: Win-2019 Unit Tests"
 
-  - group: "Extended Windows Tests"
+  - group: "Packetbeat Extended Windows Tests"
     key: "packetbeat-extended-windows-tests"
     if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/
-    steps:
-      - label: ":windows: Windows 2016 Unit Tests"
-        command: |
-          Set-Location -Path packetbeat
-          mage build unitTest
-        retry:
-          automatic:
-            - limit: 3
-        agents:
-          provider: "gcp"
-          image: "${IMAGE_WIN_2016}"
-          machine_type: "${GCP_WIN_MACHINE_TYPE}"
-          disk_size: 100
-          disk_type: "pd-ssd"
-        artifact_paths:
-          - "packetbeat/build/*.xml"
-          - "packetbeat/build/*.json"
-        notify:
-          - github_commit_status:
-              context: "packetbeat: Extended Windows 2016 Unit Tests"
 
-      - label: ":windows: Windows 2022 Unit Tests"
+    steps:
+      - label: ":windows: Packetbeat Win-2016 Unit Tests"
         command: |
           Set-Location -Path packetbeat
           mage build unitTest
@@ -151,9 +135,9 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Extended Windows 2022 Unit Tests"
+              context: "packetbeat: Win-2016 Unit Tests"
 
-      - label: ":windows: Windows 10 Unit Tests"
+      - label: ":windows: Packetbeat Win 10 Unit Tests"
         command: |
           Set-Location -Path packetbeat
           mage build unitTest
@@ -171,33 +155,13 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Extended Windows 10 Unit Tests"
-
-      - label: ":windows: Windows 11 Unit Tests"
-        command: |
-          Set-Location -Path packetbeat
-          mage build unitTest
-        key: "extended-win-11-unit-tests"
-        retry:
-          automatic:
-            - limit: 3
-        agents:
-          provider: "gcp"
-          image: "${IMAGE_WIN_11}"
-          machineType: "${GCP_WIN_MACHINE_TYPE}"
-          disk_size: 100
-          disk_type: "pd-ssd"
-        artifact_paths:
-          - "packetbeat/build/*.xml"
-          - "packetbeat/build/*.json"
-        notify:
-          - github_commit_status:
-              context: "packetbeat: Extended Windows 11 Unit Tests"
+              context: "packetbeat: Win 10 Unit Tests"
 
-  - group: "Extended Tests"
+  - group: "Packetbeat Extended Tests"
     key: "extended-tests"
+
     steps:
-      - label: ":mac: MacOS x86_64 Unit Tests"
+      - label: ":mac: Packetbeat macOS x86_64 Unit Tests"
         key: "macos-x86-64-unit-tests-extended"
         if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
         command: |
@@ -216,46 +180,7 @@ steps:
           - "packetbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "packetbeat: Extended MacOS x86_64 Unit Tests"
-
-      - label: ":mac: MacOS arm64 Unit Tests"
-        key: "macos-arm64-unit-tests-extended"
-        if: build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm).*/
-        command: |
-          set -euo pipefail
-          source .buildkite/scripts/install_macos_tools.sh
-          cd packetbeat
-          mage build unitTest
-        retry:
-          automatic:
-            - limit: 3
-        agents:
-          provider: "orka"
-          imagePrefix: "${IMAGE_MACOS_ARM}"
-        artifact_paths:
-          - "packetbeat/build/*.xml"
-          - "packetbeat/build/*.json"
-        notify:
-          - github_commit_status:
-              context: "packetbeat: Extended MacOS arm64 Unit Tests"
-
-      - label: ":linux: Ubuntu ARM Unit Tests"
-        key: "linux-arm64-unit-tests-extended"
-        command: "cd packetbeat && mage build unitTest"
-        if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
-        retry:
-          automatic:
-            - limit: 3
-        agents:
-          provider: "aws"
-          imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
-          instanceType: "${AWS_ARM_INSTANCE_TYPE}"
-        artifact_paths:
-          - "packetbeat/build/*.xml"
-          - "packetbeat/build/*.json"
-        notify:
-          - github_commit_status:
-              context: "packetbeat: Extended Ubuntu ARM Unit Tests"
+              context: "packetbeat: macOS x86_64 Unit Tests"
 
   - wait: ~
     # with PRs, we want to run packaging only if mandatory tests succeed
@@ -267,7 +192,7 @@ steps:
   - group: "Packetbeat Packaging"
     key: "packaging"
     steps:
-      - label: ":linux: Packaging Linux"
+      - label: ":ubuntu: Packetbeat Packaging Linux"
         key: "packaging-linux"
         command: |
           cd packetbeat
@@ -288,7 +213,7 @@ steps:
           - github_commit_status:
               context: "packetbeat: Packaging Linux"
 
-      - label: ":linux: Packaging ARM"
+      - label: ":ubuntu: Packetbeat Packaging arm64"
         key: "packaging-arm"
         command: |
           cd packetbeat
@@ -306,4 +231,4 @@ steps:
           PACKAGES: "docker"
         notify:
           - github_commit_status:
-              context: "packetbeat: Packaging Linux ARM"
+              context: "packetbeat: Packaging Linux arm64"
diff --git a/.buildkite/scripts/changesets.sh b/.buildkite/scripts/changesets.sh
index 7e79d2d3164..1ab80edc585 100644
--- a/.buildkite/scripts/changesets.sh
+++ b/.buildkite/scripts/changesets.sh
@@ -15,7 +15,7 @@ definePattern() {
 }
 
 defineExclusions() {
-  exclude="^$beatPath\/module\/(.*(?<!\.asciidoc|\.png))$"
+  exclude="^$beatPath\/module\/(.*(?<!\.asciidoc|\.png|Dockerfile))$"
 }
 
 defineFromCommit() {
diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
index 5ee9d8cb49a..7c809c48aad 100644
--- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml
+++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
@@ -22,6 +22,32 @@ env:
   DOCKER_PULL: 0
 
 steps:
+  - group: "Winlogbeat Check/Update"
+    key: "winlogbeat-check-update"
+    steps:
+      - label: "Run check/update"
+        command: |
+          make -C winlogbeat 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: "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
+    # this allows building DRA artifacts even if there is flakiness in check/update step
+    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
+    depends_on: "winlogbeat-check-update"
+
   - group: "Winlogbeat Mandatory Tests"
     key: "winlogbeat-mandatory-tests"
 
diff --git a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
index c74ff8773a7..8c935d8e59a 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 959caebebcc..d8bda333c0b 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 a68ba388b43..7ab0e851ffc 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 05f4765e5c7..60bccb4a8e1 100644
--- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
@@ -20,6 +20,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/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
index c14efffd837..e8b91c652bc 100644
--- a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
@@ -19,6 +19,32 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
+  - group: "x-pack/winlogbeat Check/Update"
+    key: "x-pack-winlogbeat-check-update"
+    steps:
+      - label: "Run check/update"
+        command: |
+          make -C x-pack/winlogbeat 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/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
+    # 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-winlogbeat-check-update"
+
   - group: "x-pack/winlogbeat Mandatory Tests"
     key: "x-pack-winlogbeat-mandatory-tests"
     steps:
diff --git a/.github/workflows/check-metricbeat.yml b/.github/workflows/check-metricbeat.yml
deleted file mode 100644
index 452f0dbedc1..00000000000
--- a/.github/workflows/check-metricbeat.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: check-metricbeat
-
-on:
-  pull_request:
-    paths:
-      - '.github/workflows/check-metricbeat.yml'
-      - 'metricbeat/**'
-      - 'x-pack/metricbeat/**'
-
-env:
-  BEAT_MODULE: 'metricbeat'
-
-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-winlogbeat.yml b/.github/workflows/check-winlogbeat.yml
deleted file mode 100644
index e048d585fa8..00000000000
--- a/.github/workflows/check-winlogbeat.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: check-winlogbeat
-
-on:
-  pull_request:
-    paths:
-      - '.github/workflows/check-winlogbeat.yml'
-      - 'winlogbeat/**'
-      - 'x-pack/winlogbeat/**'
-
-env:
-  BEAT_MODULE: 'winlogbeat'
-
-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 c9b77cbebb3..00000000000
--- a/.github/workflows/check-xpack-heartbeat.yml
+++ /dev/null
@@ -1,25 +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'
-
-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/.go-version b/.go-version
index ae7bbdf047a..88863fd8e36 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.21.10
+1.21.11
diff --git a/.golangci.yml b/.golangci.yml
index eba028867c2..dbb8d7a128f 100755
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -102,7 +102,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.10"
+    go: "1.21.11"
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -120,19 +120,19 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.10"
+    go: "1.21.11"
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.10"
+    go: "1.21.11"
     # Disabled:
     # ST1005: error strings should not be capitalized
     checks: ["all", "-ST1005"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.10"
+    go: "1.21.11"
 
   gosec:
     excludes:
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 5cc785f66d5..2c09e68ebe7 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -62,6 +62,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 *Affecting all Beats*
 
+- Upgrade to Go 1.21.11. {pull}39832[39832]
 
 *Auditbeat*
 
diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile
index 3f71118e8e5..fdfbc699147 100644
--- a/auditbeat/Dockerfile
+++ b/auditbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.10
+FROM golang:1.21.11
 
 RUN \
     apt-get update \
diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug
index 0054c34fb14..de570e4624f 100644
--- a/dev-tools/kubernetes/filebeat/Dockerfile.debug
+++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.21.10 as builder
+FROM golang:1.21.11 as builder
 
 ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
 
diff --git a/dev-tools/kubernetes/heartbeat/Dockerfile.debug b/dev-tools/kubernetes/heartbeat/Dockerfile.debug
index 387525941b8..4820d67dc6d 100644
--- a/dev-tools/kubernetes/heartbeat/Dockerfile.debug
+++ b/dev-tools/kubernetes/heartbeat/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.21.10 as builder
+FROM golang:1.21.11 as builder
 
 ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
 
diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug
index 0e353a3b748..438c3690dcd 100644
--- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug
+++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.21.10 as builder
+FROM golang:1.21.11 as builder
 
 ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
 
diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile
index 93b6e5186f0..f003772a2e8 100644
--- a/filebeat/Dockerfile
+++ b/filebeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.10
+FROM golang:1.21.11
 
 RUN \
     apt-get update \
diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile
index f8765612d4b..0a1e0501ab4 100644
--- a/heartbeat/Dockerfile
+++ b/heartbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.10
+FROM golang:1.21.11
 
 RUN \
     apt-get update \
diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile
index b6b676cc0ef..3e09cc79f16 100644
--- a/libbeat/Dockerfile
+++ b/libbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.10
+FROM golang:1.21.11
 
 RUN \
     apt-get update \
diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
index 931446a22a2..4715e636d4e 100644
--- a/libbeat/docs/version.asciidoc
+++ b/libbeat/docs/version.asciidoc
@@ -1,6 +1,6 @@
 :stack-version: 7.17.22
 :doc-branch: 7.17
-:go-version: 1.21.10
+:go-version: 1.21.11
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12
diff --git a/libbeat/tests/system/requirements_aix.txt b/libbeat/tests/system/requirements_aix.txt
deleted file mode 100644
index ffadc2dbdd4..00000000000
--- a/libbeat/tests/system/requirements_aix.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-requests==2.31.0
-urllib3==1.26.18
-docker==6.1.3
-docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix
-attrs==19.3.0
-autopep8==1.5.4
-backports.ssl-match-hostname==3.5.0.1
-cached-property==1.4.2
-certifi==2018.1.18
-chardet==3.0.4
-deepdiff==4.2.0
-docker-pycreds==0.4.0
-dockerpty==0.4.1
-docopt==0.6.2
-elasticsearch==7.8.1
-enum34==1.1.6
-idna==2.6
-importlib-metadata==1.7.0
-iniconfig==1.0.1
-ipaddress==1.0.19
-Jinja2==2.11.3
-jsondiff==1.1.2
-jsonschema==3.2.0
-kafka-python==1.4.3
-MarkupSafe==1.1.1
-more-itertools==8.4.0
-opentelemetry-api==1.11.0
-opentelemetry-exporter-otlp==1.11.0
-opentelemetry-sdk==1.11.0
-ordered-set==3.1.1
-packaging==20.4
-parameterized==0.7.0
-pluggy==0.13.1
-py==1.11.0
-pycodestyle==2.6.0
-pyparsing==2.4.7
-pyrsistent==0.16.0
-pytest==7.3.2
-pytest-rerunfailures==9.1.1
-pytest-timeout==1.4.2
-PyYAML==5.3.1
-redis==2.10.6
-semver==2.8.1
-setuptools==47.3.2
-six==1.15.0
-stomp.py==4.1.22
-termcolor==1.1.0
-texttable==0.9.1
-toml==0.10.1
-wcwidth==0.2.5
-websocket-client==0.47.0
-zipp>=1.2.0,<=3.1.0
diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
index 70a3494d436..554b9df0b60 100644
--- a/metricbeat/Dockerfile
+++ b/metricbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.10
+FROM golang:1.21.11
 COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/
 
 RUN \
diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile
index 0a5646a9d75..b6517fea093 100644
--- a/metricbeat/module/http/_meta/Dockerfile
+++ b/metricbeat/module/http/_meta/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.10
+FROM golang:1.21.11
 
 COPY test/main.go main.go
 
diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile
index f3cab807dfd..f443a51dd3a 100644
--- a/metricbeat/module/nats/_meta/Dockerfile
+++ b/metricbeat/module/nats/_meta/Dockerfile
@@ -2,7 +2,7 @@ ARG NATS_VERSION=2.0.4
 FROM nats:$NATS_VERSION
 
 # build stage
-FROM golang:1.21.10 AS build-env
+FROM golang:1.21.11 AS build-env
 RUN apt-get install git mercurial gcc
 RUN git clone https://github.com/nats-io/nats.go.git /nats-go
 RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build .
diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile
index 9dea6777c57..6301d44f4e2 100644
--- a/metricbeat/module/vsphere/_meta/Dockerfile
+++ b/metricbeat/module/vsphere/_meta/Dockerfile
@@ -1,5 +1,5 @@
 ARG VSPHERE_GOLANG_VERSION
-FROM golang:1.21.10
+FROM golang:1.21.11
 
 RUN apt-get install curl git
 RUN go install github.com/vmware/govmomi/vcsim@v0.30.4
diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile
index 912cd87cc43..22c50eeb430 100644
--- a/packetbeat/Dockerfile
+++ b/packetbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.10
+FROM golang:1.21.11
 
 RUN \
     apt-get update \
diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml
index bfbfe0ea7d1..f75d48577ee 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:7.17.22-b8cfff19-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.23-dc0072d1-SNAPSHOT
     healthcheck:
       test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"]
       retries: 300
@@ -22,7 +22,7 @@ services:
     - "ingest.geoip.downloader.enabled=false"
 
   logstash:
-    image: docker.elastic.co/logstash/logstash:7.17.22-b8cfff19-SNAPSHOT
+    image: docker.elastic.co/logstash/logstash:7.17.23-dc0072d1-SNAPSHOT
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
       retries: 600
@@ -32,7 +32,7 @@ services:
       - ./docker/logstash/pki:/etc/pki:ro
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:7.17.22-b8cfff19-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:7.17.23-dc0072d1-SNAPSHOT
     healthcheck:
       test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"]
       retries: 600
diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile
index 3b3a785a0ca..d1c4d5af3cd 100644
--- a/x-pack/functionbeat/Dockerfile
+++ b/x-pack/functionbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.10
+FROM golang:1.21.11
 
 RUN \
     apt-get update \
diff --git a/x-pack/libbeat/Dockerfile b/x-pack/libbeat/Dockerfile
index 2901fa41c12..e09893cca6a 100644
--- a/x-pack/libbeat/Dockerfile
+++ b/x-pack/libbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.10
+FROM golang:1.21.11
 
 RUN \
     apt-get update \
diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile
index 5023acb7b46..e7fd7774af8 100644
--- a/x-pack/metricbeat/module/stan/_meta/Dockerfile
+++ b/x-pack/metricbeat/module/stan/_meta/Dockerfile
@@ -2,7 +2,7 @@ ARG STAN_VERSION=0.15.1
 FROM nats-streaming:$STAN_VERSION
 
 # build stage
-FROM golang:1.21.10 AS build-env
+FROM golang:1.21.11 AS build-env
 RUN apt-get install git mercurial gcc
 RUN git clone https://github.com/nats-io/stan.go.git /stan-go
 RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build .