diff --git a/.go-version b/.go-version
index 88863fd8e36..2a0ba77cc5e 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.21.11
+1.22.4
diff --git a/.golangci.yml b/.golangci.yml
index 71346681f33..75cb76fcfee 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -116,7 +116,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.11"
+    go: "1.22.4"
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -136,17 +136,17 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.11"
+    go: "1.22.4"
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.11"
+    go: "1.22.4"
     checks: ["all"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.11"
+    go: "1.22.4"
 
   gosec:
     excludes:
diff --git a/Dockerfile b/Dockerfile
index e586161e548..8ae39439649 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.21.11
+ARG GO_VERSION=1.22.4
 FROM circleci/golang:${GO_VERSION}
 
 
diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold
index c8ced4bd313..ff913b57f75 100644
--- a/Dockerfile.skaffold
+++ b/Dockerfile.skaffold
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.21.11
+ARG GO_VERSION=1.22.4
 ARG crossbuild_image="docker.elastic.co/beats-dev/golang-crossbuild"
 ARG AGENT_VERSION=8.9.0-SNAPSHOT
 ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent"
diff --git a/changelog/fragments/1712176768-Upgrade-to-Go-1.21.11.yaml b/changelog/fragments/1712176768-Upgrade-to-Go-1.22.4.yaml
similarity index 95%
rename from changelog/fragments/1712176768-Upgrade-to-Go-1.21.11.yaml
rename to changelog/fragments/1712176768-Upgrade-to-Go-1.22.4.yaml
index bf98fd8e261..c1d28388d35 100644
--- a/changelog/fragments/1712176768-Upgrade-to-Go-1.21.11.yaml
+++ b/changelog/fragments/1712176768-Upgrade-to-Go-1.22.4.yaml
@@ -11,7 +11,7 @@
 kind: security
 
 # Change summary; a 80ish characters long description of the change.
-summary: Upgrade to Go 1.21.11.
+summary: Upgrade to Go 1.22.4.
 
 # Long description; in case the summary is not enough to describe the change
 # this field accommodate a description without length limits.
@@ -25,7 +25,7 @@ component: "elastic-agent"
 # If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
 # NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
 # Please provide it if you are adding a fragment for a different PR.
-pr: https://github.com/elastic/elastic-agent/pull/4855
+pr: https://github.com/elastic/elastic-agent/pull/5036
 
 # Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
 # If not present is automatically filled by the tooling with the issue linked to the PR number.
diff --git a/go.mod b/go.mod
index 1fdbf2561de..cdc82666446 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/elastic/elastic-agent
 
-go 1.21.10
+go 1.22.4
 
 require (
 	github.com/Microsoft/go-winio v0.6.2
diff --git a/version/docs/version.asciidoc b/version/docs/version.asciidoc
index 39274d373b7..1a002df4b58 100644
--- a/version/docs/version.asciidoc
+++ b/version/docs/version.asciidoc
@@ -3,7 +3,7 @@
 // FIXME: once elastic.co docs have been switched over to use `main`, remove
 // the `doc-site-branch` line below as well as any references to it in the code.
 :doc-site-branch: master
-:go-version: 1.21.11
+:go-version: 1.22.4
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12