diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3ec1597ce9e454..8630c9fa58047d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,7 @@ experimental:
 templates:
   job_template: &job_template
     docker:
-      - image: gcr.io/datadoghq/agent-circleci-runner:v55677206-ea52e48c
+      - image: gcr.io/datadoghq/agent-circleci-runner:v55750746-d62c2509
         environment:
           USE_SYSTEM_LIBS: "1"
     working_directory: /go/src/github.com/DataDog/datadog-agent
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36140fcd86b736..3fd9b1b956a3d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -170,49 +170,49 @@ variables:
   # To use images from datadog-agent-buildimages dev branches, set the corresponding
   # SUFFIX variable to _test_only
   DATADOG_AGENT_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BUILDIMAGES: v55677206-ea52e48c
+  DATADOG_AGENT_BUILDIMAGES: v55750746-d62c2509
   DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_WINBUILDIMAGES: v55677206-ea52e48c
+  DATADOG_AGENT_WINBUILDIMAGES: v55750746-d62c2509
   DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_ARMBUILDIMAGES: v55677206-ea52e48c
+  DATADOG_AGENT_ARMBUILDIMAGES: v55750746-d62c2509
   DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v55677206-ea52e48c
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v55750746-d62c2509
   DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v55677206-ea52e48c
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v55750746-d62c2509
   # New images to enable different version per image - not used yet
-  CI_IMAGE_BTF_GEN: v55677206-ea52e48c
+  CI_IMAGE_BTF_GEN: v55750746-d62c2509
   CI_IMAGE_BTF_GEN_SUFFIX: ""
-  CI_IMAGE_DEB_X64: v55677206-ea52e48c
+  CI_IMAGE_DEB_X64: v55750746-d62c2509
   CI_IMAGE_DEB_X64_SUFFIX: ""
-  CI_IMAGE_DEB_ARM64: v55677206-ea52e48c
+  CI_IMAGE_DEB_ARM64: v55750746-d62c2509
   CI_IMAGE_DEB_ARM64_SUFFIX: ""
-  CI_IMAGE_DEB_ARMHF: v55677206-ea52e48c
+  CI_IMAGE_DEB_ARMHF: v55750746-d62c2509
   CI_IMAGE_DEB_ARMHF_SUFFIX: ""
-  CI_IMAGE_DD_AGENT_TESTING: v55677206-ea52e48c
+  CI_IMAGE_DD_AGENT_TESTING: v55750746-d62c2509
   CI_IMAGE_DD_AGENT_TESTING_SUFFIX: ""
-  CI_IMAGE_DOCKER_X64: v55677206-ea52e48c
+  CI_IMAGE_DOCKER_X64: v55750746-d62c2509
   CI_IMAGE_DOCKER_X64_SUFFIX: ""
-  CI_IMAGE_DOCKER_ARM64: v55677206-ea52e48c
+  CI_IMAGE_DOCKER_ARM64: v55750746-d62c2509
   CI_IMAGE_DOCKER_ARM64_SUFFIX: ""
-  CI_IMAGE_GITLAB_AGENT_DEPLOY: v55677206-ea52e48c
+  CI_IMAGE_GITLAB_AGENT_DEPLOY: v55750746-d62c2509
   CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: ""
-  CI_IMAGE_LINUX_GLIBC_2_17_X64: v55677206-ea52e48c
+  CI_IMAGE_LINUX_GLIBC_2_17_X64: v55750746-d62c2509
   CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: ""
-  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v55677206-ea52e48c
+  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v55750746-d62c2509
   CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: ""
-  CI_IMAGE_SYSTEM_PROBE_X64: v55677206-ea52e48c
+  CI_IMAGE_SYSTEM_PROBE_X64: v55750746-d62c2509
   CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: ""
-  CI_IMAGE_SYSTEM_PROBE_ARM64: v55677206-ea52e48c
+  CI_IMAGE_SYSTEM_PROBE_ARM64: v55750746-d62c2509
   CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: ""
-  CI_IMAGE_RPM_X64: v55677206-ea52e48c
+  CI_IMAGE_RPM_X64: v55750746-d62c2509
   CI_IMAGE_RPM_X64_SUFFIX: ""
-  CI_IMAGE_RPM_ARM64: v55677206-ea52e48c
+  CI_IMAGE_RPM_ARM64: v55750746-d62c2509
   CI_IMAGE_RPM_ARM64_SUFFIX: ""
-  CI_IMAGE_RPM_ARMHF: v55677206-ea52e48c
+  CI_IMAGE_RPM_ARMHF: v55750746-d62c2509
   CI_IMAGE_RPM_ARMHF_SUFFIX: ""
-  CI_IMAGE_WIN_1809_X64: v55677206-ea52e48c
+  CI_IMAGE_WIN_1809_X64: v55750746-d62c2509
   CI_IMAGE_WIN_1809_X64_SUFFIX: ""
-  CI_IMAGE_WIN_LTSC2022_X64: v55677206-ea52e48c
+  CI_IMAGE_WIN_LTSC2022_X64: v55750746-d62c2509
   CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: ""
 
   DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
diff --git a/.go-version b/.go-version
index ca8ec414e78720..d8c40e539ce6be 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.23.5
+1.23.6
diff --git a/.wwhrd.yml b/.wwhrd.yml
index 9ca0e52d9758ee..1654376c2835cb 100644
--- a/.wwhrd.yml
+++ b/.wwhrd.yml
@@ -45,4 +45,4 @@ exceptions:
 
 additional:
   # list here paths to additional licenses
-  golang/go: "raw.githubusercontent.com/golang/go/go1.23.5/LICENSE"
+  golang/go: "raw.githubusercontent.com/golang/go/go1.23.6/LICENSE"
diff --git a/devenv/scripts/Install-DevEnv.ps1 b/devenv/scripts/Install-DevEnv.ps1
index 5d7b7e6a4c43be..4f4a6c238e360a 100644
--- a/devenv/scripts/Install-DevEnv.ps1
+++ b/devenv/scripts/Install-DevEnv.ps1
@@ -45,7 +45,7 @@ Write-Host -ForegroundColor Yellow -BackgroundColor DarkGreen '- Installing Gola
 $ErrorActionPreference = 'Stop'
 $ProgressPreference = 'SilentlyContinue'
 
-$go_version = "1.23.5"
+$go_version = "1.23.6"
 Write-Host -ForegroundColor Green "Installing go $go_version"
 
 $gozip = "https://dl.google.com/go/go$go_version.windows-amd64.zip"
diff --git a/docs/dev/agent_dev_env.md b/docs/dev/agent_dev_env.md
index e53dfeb49dc334..91a3addfc62409 100644
--- a/docs/dev/agent_dev_env.md
+++ b/docs/dev/agent_dev_env.md
@@ -138,7 +138,7 @@ This procedure ensures you not only get the correct version of `invoke`, but als
 
 ### Golang
 
-You must [install Golang](https://golang.org/doc/install) version `1.23.5` or
+You must [install Golang](https://golang.org/doc/install) version `1.23.6` or
 later. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke`
 cannot use any additional tool it might need.
 
diff --git a/go.mod b/go.mod
index db5be92d57cc53..5a685187e42b8a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent
 
-go 1.23.3
+go 1.23.0
 
 // v0.8.0 was tagged long ago, and appared on pkg.go.dev.  We do not want any tagged version
 // to appear there.  The trick to accomplish this is to make a new version (in this case v0.9.0)
diff --git a/go.work b/go.work
index c3ca1642084cdc..ee4edaab465389 100644
--- a/go.work
+++ b/go.work
@@ -1,6 +1,6 @@
 go 1.23.3
 
-toolchain go1.23.5
+toolchain go1.23.6
 
 use (
 	.
diff --git a/releasenotes/notes/bump-go-to-1.23.6-eec53756d8368c71.yaml b/releasenotes/notes/bump-go-to-1.23.6-eec53756d8368c71.yaml
new file mode 100644
index 00000000000000..69e7f8b82af5bf
--- /dev/null
+++ b/releasenotes/notes/bump-go-to-1.23.6-eec53756d8368c71.yaml
@@ -0,0 +1,4 @@
+---
+enhancements:
+- |
+    Agents are now built with Go ``1.23.6``.
diff --git a/tasks/go.py b/tasks/go.py
index cd925143fba88c..f54fa762061f28 100644
--- a/tasks/go.py
+++ b/tasks/go.py
@@ -343,7 +343,7 @@ def tidy(ctx):
 @task
 def check_go_version(ctx):
     go_version_output = ctx.run('go version')
-    # result is like "go version go1.23.5 linux/amd64"
+    # result is like "go version go1.23.6 linux/amd64"
     running_go_version = go_version_output.stdout.split(' ')[2]
 
     with open(".go-version") as f:
diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod
index 815149b8254810..d8813ea7dd9614 100644
--- a/test/new-e2e/go.mod
+++ b/test/new-e2e/go.mod
@@ -1,8 +1,8 @@
 module github.com/DataDog/datadog-agent/test/new-e2e
 
-go 1.23.3
+go 1.23.1
 
-toolchain go1.23.5
+toolchain go1.23.6
 
 // Do not upgrade Pulumi plugins to versions different from `test-infra-definitions`.
 // The plugin versions NEED to be aligned.
diff --git a/tools/gdb/Dockerfile b/tools/gdb/Dockerfile
index 2f932a8c66df50..e1c00c092471c1 100644
--- a/tools/gdb/Dockerfile
+++ b/tools/gdb/Dockerfile
@@ -6,7 +6,7 @@ RUN rm -vf /etc/ssl/openssl.cnf
 RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y gdb build-essential strace less vim
 
 # Install go
-RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.23.5.linux-amd64.tar.gz
+RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.23.6.linux-amd64.tar.gz
 RUN tar xzvf golang.tgz
 RUN ln -s /go /goroot