diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
index cb61808a5d94..3e6c712125af 100644
--- a/.buildkite/auditbeat/auditbeat-pipeline.yml
+++ b/.buildkite/auditbeat/auditbeat-pipeline.yml
@@ -260,7 +260,7 @@ steps:
       - label: ":ubuntu: Auditbeat: Packaging Linux"
         key: "auditbeat-package-linux-x86"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh auditbeat
         retry:
@@ -278,8 +278,7 @@ steps:
       - label: ":linux: Auditbeat: Packaging Linux arm64"
         key: "auditbeat-package-linux-arm64"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         command: |
           .buildkite/scripts/packaging/packaging.sh auditbeat
         retry:
diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
index 4dfca856e69c..29ba1d6ba17a 100644
--- a/.buildkite/filebeat/filebeat-pipeline.yml
+++ b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -302,7 +302,7 @@ steps:
       - label: ":ubuntu: Filebeat: Packaging Linux"
         key: "packaging-linux"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh filebeat
         retry:
@@ -322,7 +322,7 @@ steps:
       - label: ":ubuntu: Filebeat: Packaging arm64"
         key: "packaging-arm"
         env:
-          PLATFORMS: "linux/arm64"
+          PLATFORMS: "+all linux/arm64"
           PACKAGES: "docker"
         command: |
           .buildkite/scripts/packaging/packaging.sh filebeat
diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
index a65e71ed33b2..cff84cc4c1f8 100644
--- a/.buildkite/heartbeat/heartbeat-pipeline.yml
+++ b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -277,7 +277,7 @@ steps:
       - label: ":ubuntu: Heartbeat: Packaging Linux"
         key: "heartbeat-package-linux"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh heartbeat
         retry:
@@ -295,8 +295,7 @@ steps:
       - label: ":ubuntu: Heartbeat: Packaging Linux arm64"
         key: "heartbeat-package-linux-arm"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         command: |
           .buildkite/scripts/packaging/packaging.sh heartbeat
         retry:
diff --git a/.buildkite/libbeat/pipeline.libbeat.yml b/.buildkite/libbeat/pipeline.libbeat.yml
index 07030df04f02..a98856f50ae1 100644
--- a/.buildkite/libbeat/pipeline.libbeat.yml
+++ b/.buildkite/libbeat/pipeline.libbeat.yml
@@ -141,26 +141,6 @@ steps:
           - github_commit_status:
               context: "libbeat: next major"
 
-      - label: ":ubuntu: Libbeat: Crosscompile"
-        key: "mandatory-cross-compile"
-        command: |
-          set -euo pipefail
-          cd libbeat
-          make crosscompile
-        retry:
-          automatic:
-            - limit: 1
-        agents:
-          provider: "gcp"
-          image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "${GCP_HI_PERF_MACHINE_TYPE}"
-        artifact_paths:
-          - "libbeat/build/*.xml"
-          - "libbeat/build/*.json"
-        notify:
-          - github_commit_status:
-              context: "libbeat: Crosscompile"
-
       - label: ":ubuntu: Libbeat: Stress Tests"
         key: "mandatory-stress-test"
         command: |
diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml
index 934728fa3f86..62832c8b9aa0 100644
--- a/.buildkite/metricbeat/pipeline.yml
+++ b/.buildkite/metricbeat/pipeline.yml
@@ -143,25 +143,6 @@ steps:
           - github_commit_status:
               context: "metricbeat: Python Integration Tests"
 
-      - label: ":ubuntu: Metricbeat: Crosscompile"
-        key: "mandatory-cross-compile"
-        command: |
-          source .buildkite/scripts/qemu.sh
-          make -C metricbeat crosscompile
-        retry:
-          automatic:
-            - limit: 1
-        agents:
-          provider: "gcp"
-          image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "${GCP_DEFAULT_MACHINE_TYPE}"
-        artifact_paths:
-          - "metricbeat/build/*.xml"
-          - "metricbeat/build/*.json"
-        notify:
-          - github_commit_status:
-              context: "metricbeat: Crosscompile"
-
       - label: ":windows: Metricbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path metricbeat
@@ -271,7 +252,7 @@ steps:
       - label: ":ubuntu: Metricbeat: Packaging Linux"
         key: "packaging-linux"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh metricbeat
         retry:
@@ -291,8 +272,7 @@ steps:
       - label: ":ubuntu: Metricbeat: Packaging Linux arm64"
         key: "packaging-arm"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         command: |
           .buildkite/scripts/packaging/packaging.sh metricbeat
         retry:
diff --git a/.buildkite/packaging.pipeline.yml b/.buildkite/packaging.pipeline.yml
index b656651e0426..ef6fb5db3c1d 100644
--- a/.buildkite/packaging.pipeline.yml
+++ b/.buildkite/packaging.pipeline.yml
@@ -9,7 +9,7 @@ env:
   IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"
 
   PLATFORMS: "+all linux/amd64 linux/386 linux/arm64 windows/amd64 windows/386 darwin/amd64"
-  PLATFORMS_ARM: "linux/arm64"
+  PLATFORMS_ARM: "+all linux/arm64"
 
 steps:
   # we use concurrency gates (https://buildkite.com/blog/concurrency-gates)
@@ -120,10 +120,9 @@ steps:
           - x-pack/packetbeat
           - x-pack/winlogbeat
 
-      - label: "SNAPSHOT: {{matrix}} docker Linux/arm64"
+      - label: "SNAPSHOT: {{matrix}} Linux/arm64 and Darwin/arm64"
         env:
           PLATFORMS: "${PLATFORMS_ARM}"
-          PACKAGES: "docker"
           SNAPSHOT: true
           DEV: true
         command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}"
@@ -149,6 +148,8 @@ steps:
           - x-pack/heartbeat
           - x-pack/metricbeat
           - x-pack/packetbeat
+          - x-pack/osquerybeat
+          - x-pack/agentbeat
 
   - group: Packaging staging
     key: packaging-staging
@@ -189,10 +190,9 @@ steps:
           - x-pack/packetbeat
           - x-pack/winlogbeat
 
-      - label: "STAGING: {{matrix}} docker Linux/arm64"
+      - label: "STAGING: {{matrix}} Linux/arm64 and Darwin/arm64"
         env:
           PLATFORMS: "${PLATFORMS_ARM}"
-          PACKAGES: "docker"
           SNAPSHOT: false
           DEV: false
         command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}"
@@ -218,6 +218,8 @@ steps:
           - x-pack/heartbeat
           - x-pack/metricbeat
           - x-pack/packetbeat
+          - x-pack/osquerybeat
+          - x-pack/agentbeat
 
   - group: DRA publish
     key: dra
diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml
index c0514061a217..4fc34254948a 100644
--- a/.buildkite/packetbeat/pipeline.packetbeat.yml
+++ b/.buildkite/packetbeat/pipeline.packetbeat.yml
@@ -217,7 +217,7 @@ steps:
       - label: ":ubuntu: Packetbeat: Packaging Linux"
         key: "packaging-linux"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh packetbeat
         retry:
@@ -237,8 +237,7 @@ steps:
       - label: ":ubuntu: Packetbeat: Packaging Linux arm64"
         key: "packaging-arm"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         command: |
           .buildkite/scripts/packaging/packaging.sh packetbeat
         retry:
diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
index 153862821bf8..d23ff8a8eba5 100644
--- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml
+++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
@@ -66,23 +66,6 @@ steps:
     key: "winlogbeat-mandatory-tests"
 
     steps:
-      - label: ":ubuntu: Winlogbeat: Crossccompile"
-        key: "mandatory-cross-compile"
-        command: "make -C winlogbeat crosscompile"
-        retry:
-          automatic:
-            - limit: 1
-        agents:
-          provider: "gcp"
-          image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "${GCP_DEFAULT_MACHINE_TYPE}"
-        artifact_paths:
-          - "winlogbeat/build/*.xml"
-          - "winlogbeat/build/*.json"
-        notify:
-          - github_commit_status:
-              context: "winlogbeat: Crosscompile"
-
       - label: ":windows: Winlogbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path winlogbeat
@@ -186,7 +169,7 @@ steps:
       - label: ":ubuntu: Winlogbeat: Packaging Linux"
         key: "packaging-linux"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh winlogbeat
         retry:
diff --git a/.buildkite/x-pack/elastic-agent/pipeline.xpack.elastic-agent.package.yml b/.buildkite/x-pack/elastic-agent/pipeline.xpack.elastic-agent.package.yml
index e962ee9144c8..5fba6a21e871 100644
--- a/.buildkite/x-pack/elastic-agent/pipeline.xpack.elastic-agent.package.yml
+++ b/.buildkite/x-pack/elastic-agent/pipeline.xpack.elastic-agent.package.yml
@@ -71,8 +71,7 @@ steps:
 
       - label: "Package ARM elastic-agent"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         key: package_elastic-agent-arm
         command: |
           if [[ -z "$${MANIFEST_URL}" ]]; then
diff --git a/.buildkite/x-pack/elastic-agent/scripts/steps/setenv.sh b/.buildkite/x-pack/elastic-agent/scripts/steps/setenv.sh
index 7bc0cfd16949..eaf8549cb147 100644
--- a/.buildkite/x-pack/elastic-agent/scripts/steps/setenv.sh
+++ b/.buildkite/x-pack/elastic-agent/scripts/steps/setenv.sh
@@ -9,8 +9,8 @@ SETUP_WIN_PYTHON_VERSION="3.11.0"
 NMAP_WIN_VERSION="7.12"           # Earlier versions of NMap provide WinPcap (the winpcap packages don't install nicely because they pop-up a UI)
 GO_VERSION=$(cat .go-version)
 ASDF_MAGE_VERSION="1.15.0"
-PACKAGING_PLATFORMS="+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
-PACKAGING_ARM_PLATFORMS="linux/arm64"
+PACKAGING_PLATFORMS="+all linux/amd64 windows/amd64 darwin/amd64"
+PACKAGING_ARM_PLATFORMS="+all linux/arm64"
 
 export SETUP_GVM_VERSION
 export DOCKER_COMPOSE_VERSION
diff --git a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml
index 12dfa97059ba..3b56873686a1 100644
--- a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml
@@ -239,7 +239,7 @@ steps:
           disk_size: 100
           disk_type: "pd-ssd"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         notify:
           - github_commit_status:
               context: "x-pack/auditbeat: Packaging Linux"
@@ -257,8 +257,7 @@ steps:
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
           instanceType: "${AWS_ARM_INSTANCE_TYPE}"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         notify:
           - github_commit_status:
               context: "x-pack/auditbeat: Packaging Linux arm64"
diff --git a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
index 11fafadaceff..e2e939072188 100644
--- a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
@@ -79,7 +79,7 @@ steps:
           - "x-pack/dockerlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/dockerlogbeat: Ubuntu Unit Tests"
+              context: "x-pack/dockerlogbeat: Ubuntu x86_64 Unit Tests"
 
       # x-pack/dockerlogbeat has no modules yet
       - label: ":ubuntu: x-pack/dockerlogbeat: Go Integration Tests"
@@ -116,7 +116,7 @@ steps:
       - label: ":ubuntu: x-pack/dockerlogbeat: Packaging Linux"
         key: "auditbeat-package-linux-x86"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
           SNAPSHOT: true
         command: |
           .buildkite/scripts/packaging/packaging.sh x-pack/dockerlogbeat
@@ -135,8 +135,7 @@ steps:
       - label: ":linux: x-pack/dockerlogbeat: Packaging Linux arm64"
         key: "auditbeat-package-linux-arm"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
           SNAPSHOT: true
         command: |
           .buildkite/scripts/packaging/packaging.sh x-pack/dockerlogbeat
diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
index 8fd4a5315686..909ab982355d 100644
--- a/.buildkite/x-pack/pipeline.xpack.filebeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
@@ -326,7 +326,7 @@ steps:
           disk_size: 100
           disk_type: "pd-ssd"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         notify:
           - github_commit_status:
               context: "x-pack/filebeat: Packaging Linux"
@@ -344,8 +344,7 @@ steps:
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
           instanceType: "${AWS_ARM_INSTANCE_TYPE}"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         notify:
           - github_commit_status:
               context: "x-pack/filebeat: Packaging Linux arm64"
diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
index 1addc844d6af..f4ec3857dcb0 100644
--- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
@@ -253,7 +253,7 @@ steps:
           disk_size: 100
           disk_type: "pd-ssd"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         notify:
           - github_commit_status:
               context: "x-pack/heartbeat: Packaging Linux"
@@ -271,8 +271,7 @@ steps:
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
           instanceType: "${AWS_ARM_INSTANCE_TYPE}"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         notify:
           - github_commit_status:
               context: "x-pack/heartbeat: Packaging Linux arm64"
diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
index ffacd60dc3a0..11ca086d24c2 100644
--- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
@@ -286,7 +286,7 @@ steps:
           disk_size: 100
           disk_type: "pd-ssd"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         notify:
           - github_commit_status:
               context: "x-pack/metricbeat: Packaging Linux"
@@ -304,8 +304,7 @@ steps:
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
           instanceType: "${AWS_ARM_INSTANCE_TYPE}"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         notify:
           - github_commit_status:
               context: "x-pack/metricbeat: Packaging Linux arm64"
diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
index f651ce6789bd..7b9a6de0a706 100644
--- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
@@ -229,7 +229,7 @@ steps:
           disk_size: 100
           disk_type: "pd-ssd"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         notify:
           - github_commit_status:
               context: "x-pack/osquerybeat: Packaging Linux"
diff --git a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml
index 392625a051df..981a35059af6 100644
--- a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml
@@ -229,7 +229,7 @@ steps:
           disk_size: 100
           disk_type: "pd-ssd"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         notify:
           - github_commit_status:
               context: "x-pack/packetbeat: Packaging Linux"
@@ -247,8 +247,7 @@ steps:
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
           instanceType: "${AWS_ARM_INSTANCE_TYPE}"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         notify:
           - github_commit_status:
               context: "x-pack/packetbeat: Packaging Linux arm64"
diff --git a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
index f247e6bd5010..455418c58fe6 100644
--- a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
@@ -183,7 +183,7 @@ steps:
       - label: ":ubuntu: x-pack/winlogbeat Packaging Linux"
         key: "packaging-linux"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh x-pack/winlogbeat
         retry:
diff --git a/.go-version b/.go-version
index d8c40e539ce6..82bfa5ce3fc2 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.23.6
+1.23.8
diff --git a/.golangci.yml b/.golangci.yml
index fa0b4d34d5bd..f4ec4a3097ac 100755
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -59,16 +59,21 @@ linters:
         - pattern: fmt.Print.*
     gomoddirectives:
       replace-allow-list:
-        - github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption
+        - github.com/Azure/azure-sdk-for-go
+        - github.com/Microsoft/go-winio
         - github.com/Shopify/sarama
         - github.com/apoydence/eachers
+        - github.com/cucumber/godog
+        - github.com/docker/docker
+        - github.com/docker/go-plugins-helpers
         - github.com/dop251/goja
         - github.com/dop251/goja_nodejs
         - github.com/fsnotify/fsevents
         - github.com/fsnotify/fsnotify
+        - github.com/golang/glog
         - github.com/google/gopacket
         - github.com/insomniacslk/dhcp
-        - github.com/meraki/dashboard-api-go/v3
+        - github.com/tonistiigi/fifo
         - github.com/snowflakedb/gosnowflake
       replace-local: false
     gomodguard:
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 361990696836..72f467a19d89 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -108,7 +108,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 *Affecting all Beats*
 
-- Update to Go 1.23.6. {pull}42705[42705]
+- Update to Go 1.23.8. {pull}44585[44585]
 
 *Auditbeat*
 
diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile
index 9e872194fa7a..e778287405af 100644
--- a/auditbeat/Dockerfile
+++ b/auditbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6
+FROM golang:1.23.8
 
 RUN \
     apt-get update \
diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug
index 0612367bed6c..ff2c3759a973 100644
--- a/dev-tools/kubernetes/filebeat/Dockerfile.debug
+++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.23.6 as builder
+FROM golang:1.23.8 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 d13fbe70cd22..b2d2b85ce081 100644
--- a/dev-tools/kubernetes/heartbeat/Dockerfile.debug
+++ b/dev-tools/kubernetes/heartbeat/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.23.6 as builder
+FROM golang:1.23.8 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 0a418f5698de..7ef8586b466a 100644
--- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug
+++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.23.6 as builder
+FROM golang:1.23.8 as builder
 
 ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
 
diff --git a/dev-tools/mage/crossbuild.go b/dev-tools/mage/crossbuild.go
index 7faa6a9dfe3b..ec21eba98c32 100644
--- a/dev-tools/mage/crossbuild.go
+++ b/dev-tools/mage/crossbuild.go
@@ -202,11 +202,7 @@ func CrossBuildImage(platform string) (string, error) {
 	case platform == "darwin/arm64":
 		tagSuffix = "darwin-arm64-debian10"
 	case platform == "linux/arm64":
-		tagSuffix = "arm"
-		// when it runs on a ARM64 host/worker.
-		if runtime.GOARCH == "arm64" {
-			tagSuffix = "base-arm-debian9"
-		}
+		tagSuffix = "base-arm-debian9"
 	case platform == "linux/armv5":
 		tagSuffix = "armel"
 	case platform == "linux/armv6":
diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile
index 4106ba28d383..91d091831e82 100644
--- a/filebeat/Dockerfile
+++ b/filebeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6
+FROM golang:1.23.8
 
 RUN \
     apt-get update \
diff --git a/go.mod b/go.mod
index 3d5033ebb0f0..7df3d7450b1d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/elastic/beats/v7
 
-go 1.23.6
-
-toolchain go1.23.8
+go 1.23.8
 
 require (
 	cloud.google.com/go/bigquery v1.59.1
diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile
index 095925fdede0..1a6a8e7a598f 100644
--- a/heartbeat/Dockerfile
+++ b/heartbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6
+FROM golang:1.23.8
 
 RUN \
     apt-get update \
diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile
index c31ff25e8b61..7b5c555dbccc 100644
--- a/libbeat/Dockerfile
+++ b/libbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6
+FROM golang:1.23.8
 
 RUN \
     apt-get update \
diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
index 4ad15662577f..0971a09d6a50 100644
--- a/libbeat/docs/version.asciidoc
+++ b/libbeat/docs/version.asciidoc
@@ -1,6 +1,6 @@
 :stack-version: 7.17.28
 :doc-branch: 7.17
-:go-version: 1.23.6
+:go-version: 1.23.8
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12
diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
index a9da92c76348..e6a2679be12e 100644
--- a/metricbeat/Dockerfile
+++ b/metricbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6
+FROM golang:1.23.8
 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 22a59e9c2758..ac8c416d8d14 100644
--- a/metricbeat/module/http/_meta/Dockerfile
+++ b/metricbeat/module/http/_meta/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6
+FROM golang:1.23.8
 
 COPY test/main.go main.go
 
diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile
index bace3e9c6b8b..bc2ab7d4a7a5 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.23.6 AS build-env
+FROM golang:1.23.8 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 6f67b4e5011d..85bc6a9b7a10 100644
--- a/metricbeat/module/vsphere/_meta/Dockerfile
+++ b/metricbeat/module/vsphere/_meta/Dockerfile
@@ -1,5 +1,5 @@
 ARG VSPHERE_GOLANG_VERSION
-FROM golang:1.23.6
+FROM golang:1.23.8
 
 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 e904ade2ba1c..f69a44fad789 100644
--- a/packetbeat/Dockerfile
+++ b/packetbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6
+FROM golang:1.23.8
 
 RUN \
     apt-get update \
diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile
index ceca16fed4d3..b1ed5a87f49e 100644
--- a/x-pack/functionbeat/Dockerfile
+++ b/x-pack/functionbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6
+FROM golang:1.23.8
 
 RUN \
     apt-get update \
diff --git a/x-pack/libbeat/Dockerfile b/x-pack/libbeat/Dockerfile
index b52a89c185c9..35f641e2708b 100644
--- a/x-pack/libbeat/Dockerfile
+++ b/x-pack/libbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6
+FROM golang:1.23.8
 
 RUN \
     apt-get update \
diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile
index e8d13f72d7a6..301f8f2d55d3 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.23.6 AS build-env
+FROM golang:1.23.8 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 .