diff --git a/build-image/Dockerfile b/build-image/Dockerfile
index bf8eb01dc846..7bce2ddfde9e 100644
--- a/build-image/Dockerfile
+++ b/build-image/Dockerfile
@@ -23,7 +23,7 @@ FROM alpine:3.17 as helm
 RUN apk add --no-cache helm
 
 # Dependency: Go and Go dependencies
-FROM golang:1.21.6-bullseye as golang
+FROM golang:1.22.0-bullseye as golang
 
 # Keep in sync with cmd/grafana-agent-operator/DEVELOPERS.md
 ENV CONTROLLER_GEN_VERSION v0.9.2
diff --git a/build-image/windows/Dockerfile b/build-image/windows/Dockerfile
index 26cc62c445be..ddd3448e2c09 100644
--- a/build-image/windows/Dockerfile
+++ b/build-image/windows/Dockerfile
@@ -1,4 +1,4 @@
-FROM library/golang:1.21.6-windowsservercore-1809
+FROM library/golang:1.22.0-windowsservercore-1809
 
 SHELL ["powershell", "-command"]
 
diff --git a/go.mod b/go.mod
index c9800748482b..acd529893a34 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/agent
 
-go 1.21.0
+go 1.22.0
 
 require (
 	cloud.google.com/go/pubsub v1.33.0