diff --git a/Dockerfile.ci b/Dockerfile.ci
index 0e995e51e..53fc07e23 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,3 +1,3 @@
-FROM golang:1.23@sha256:ad5c126b5cf501a8caef751a243bb717ec204ab1aa56dc41dc11be089fafcb4f
+FROM golang:1.22@sha256:0ca97f4ab335f4b284a5b8190980c7cdc21d320d529f2b643e8a8733a69bfb6b
 
 COPY --from=envoyproxy/envoy-dev:latest /usr/local/bin/envoy /usr/local/bin/envoy
diff --git a/README.md b/README.md
index 100c72846..548239971 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ feedback, we might decide to revisit this aspect at a later point in time.
 
 ## Requirements
 
-1. Go 1.21+
+1. Go 1.22+
 
 ## Quick start
 
diff --git a/examples/dyplomat/Dockerfile b/examples/dyplomat/Dockerfile
index 63b3b6d8a..b0fc3fe8f 100644
--- a/examples/dyplomat/Dockerfile
+++ b/examples/dyplomat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21@sha256:672a2286da3ee7a854c3e0a56e0838918d0dbb1c18652992930293312de898a6
+FROM golang:1.22@sha256:0ca97f4ab335f4b284a5b8190980c7cdc21d320d529f2b643e8a8733a69bfb6b
 
 WORKDIR /go/src/dyplomat
 COPY . /go/src/dyplomat
diff --git a/examples/dyplomat/go.mod b/examples/dyplomat/go.mod
index e3e5b9c85..fe4f4ce2d 100644
--- a/examples/dyplomat/go.mod
+++ b/examples/dyplomat/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/go-control-plane/examples/dyplomat
 
-go 1.21
+go 1.22.8
 
 require (
 	github.com/envoyproxy/go-control-plane v0.13.0
diff --git a/go.mod b/go.mod
index 71adf6a5c..6609e255d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/go-control-plane
 
-go 1.21
+go 1.22.8
 
 require (
 	github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b
diff --git a/xdsmatcher/go.mod b/xdsmatcher/go.mod
index 979062dd0..fb9b6a752 100644
--- a/xdsmatcher/go.mod
+++ b/xdsmatcher/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/go-control-plane/xdsmatcher
 
-go 1.21
+go 1.22.8
 
 require (
 	github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b