diff --git a/.golangci.yml b/.golangci.yml
index 4c0c3bf0aff..ba7166b4963 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -112,17 +112,15 @@ linters-settings:
     # Forbid any `replace` directives that are intended temporarily only during
     # development. The modules listed below are intended to be replaced permanently.
     replace-allow-list:
-      - github.com/Microsoft/go-winio
       - github.com/Shopify/sarama
       - github.com/dop251/goja
       - github.com/dop251/goja_nodejs
       - github.com/fsnotify/fsnotify
       - github.com/openshift/api
-      - github.com/tonistiigi/fifo
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.22.7"
+    go: "1.22.8"
 
   nolintlint:
     # Enable to ensure that nolint directives are all used. Default is true.
@@ -138,17 +136,17 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.22.7"
+    go: "1.22.8"
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.22.7"
+    go: "1.22.8"
     checks: ["all"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.22.7"
+    go: "1.22.8"
 
   gosec:
     excludes:
diff --git a/Dockerfile b/Dockerfile
index a0e92c8b586..006fe6dae5f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.22.7
+ARG GO_VERSION=1.22.8
 FROM circleci/golang:${GO_VERSION}
 
 
diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold
index 195380a4e38..c3b8a22ab1b 100644
--- a/Dockerfile.skaffold
+++ b/Dockerfile.skaffold
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.22.7
+ARG GO_VERSION=1.22.8
 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/NOTICE.txt b/NOTICE.txt
index cbb43169796..a1599fa1247 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -843,11 +843,11 @@ License Version 2.0.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-autodiscover
-Version: v0.8.2
+Version: v0.9.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-autodiscover@v0.8.2/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-autodiscover@v0.9.0/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
diff --git a/go.mod b/go.mod
index 0e297ea0125..39dca8f0a3e 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/docker/go-units v0.5.0
 	github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
 	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241001172226-9ae6ed1e3de1
-	github.com/elastic/elastic-agent-autodiscover v0.8.2
+	github.com/elastic/elastic-agent-autodiscover v0.9.0
 	github.com/elastic/elastic-agent-client/v7 v7.16.0
 	github.com/elastic/elastic-agent-libs v0.11.0
 	github.com/elastic/elastic-agent-system-metrics v0.11.3
diff --git a/go.sum b/go.sum
index e5cff718cc5..45c6f3afd66 100644
--- a/go.sum
+++ b/go.sum
@@ -412,8 +412,8 @@ github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0=
 github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68=
 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241001172226-9ae6ed1e3de1 h1:P6cjexsz8vZfcSOgh3GYQCNaO9K00EPlgOCuK8yZXNw=
 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241001172226-9ae6ed1e3de1/go.mod h1:ybiAMVN7ZBDFTHWTB2eLubwYddoLKKcKX2BZfX5egH8=
-github.com/elastic/elastic-agent-autodiscover v0.8.2 h1:Fs2FhR33AMBPfm5/jz4drVzaEZaqOIHlDBvGtkUZdIk=
-github.com/elastic/elastic-agent-autodiscover v0.8.2/go.mod h1:VZnU53EVaFTxR8Xf6YsLN8FHD5DKQzHSPlKax9/4w+o=
+github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0JojNasPgYIA47gpuuns=
+github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4=
 github.com/elastic/elastic-agent-client/v7 v7.16.0 h1:yKGq2+CxAuW8Kh0EoNl202tqAyQKfBcPRawVKs2Jve0=
 github.com/elastic/elastic-agent-client/v7 v7.16.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI=
 github.com/elastic/elastic-agent-libs v0.11.0 h1:m9rnNE3BkBF2XJoqubqEbu/kbtKEBZ7pHCjDlxfVRH0=
diff --git a/testing/integration/install_test.go b/testing/integration/install_test.go
index d0fea77933e..50bf0363b5b 100644
--- a/testing/integration/install_test.go
+++ b/testing/integration/install_test.go
@@ -339,6 +339,8 @@ func TestInstallUninstallAudit(t *testing.T) {
 		require.NoError(t, err)
 	}
 
+	// TODO: replace direct query to ES index with API call to Fleet
+	// Blocked on https://github.com/elastic/kibana/issues/194884
 	response, err := info.ESClient.Get(".fleet-agents", agentID, info.ESClient.Get.WithContext(ctx))
 	require.NoError(t, err)
 	defer response.Body.Close()
diff --git a/version/docs/version.asciidoc b/version/docs/version.asciidoc
index bba32108361..4baf03aff88 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.22.7
+:go-version: 1.22.8
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12