diff --git a/.go-version b/.go-version
index 89144dbc38f..2a0ba77cc5e 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.22.3
+1.22.4
diff --git a/CHANGELOG/CHANGELOG-3.4.md b/CHANGELOG/CHANGELOG-3.4.md
index e8eaababdc6..510e590e4fb 100644
--- a/CHANGELOG/CHANGELOG-3.4.md
+++ b/CHANGELOG/CHANGELOG-3.4.md
@@ -10,7 +10,7 @@ Previous change logs can be found at [CHANGELOG-3.3](https://github.com/etcd-io/
- Fix [Memberlist results not updated when proxy node down](https://github.com/etcd-io/etcd/pull/17896).
### Dependencies
-- Compile binaries using go [1.21.10](https://github.com/etcd-io/etcd/pull/17981).
+- Compile binaries using go [1.21.11](https://github.com/etcd-io/etcd/pull/18130).
- Upgrade [bbolt to 1.3.10](https://github.com/etcd-io/etcd/pull/17945).
diff --git a/CHANGELOG/CHANGELOG-3.5.md b/CHANGELOG/CHANGELOG-3.5.md
index ab6d1088c4e..e7e72dcbc82 100644
--- a/CHANGELOG/CHANGELOG-3.5.md
+++ b/CHANGELOG/CHANGELOG-3.5.md
@@ -6,7 +6,9 @@ Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/
## v3.5.15 (TBD)
-
+### Dependencies
+- Compile binaries using [go 1.21.11](https://github.com/etcd-io/etcd/pull/18129).
+
## v3.5.14 (2024-05-29)
diff --git a/api/go.mod b/api/go.mod
index 7a0617c7f7b..e0297ab43ad 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/api/v3
go 1.22
-toolchain go1.22.3
+toolchain go1.22.4
require (
github.com/coreos/go-semver v0.3.1
diff --git a/client/internal/v2/go.mod b/client/internal/v2/go.mod
index 08f32cb6f1a..b236ad74847 100644
--- a/client/internal/v2/go.mod
+++ b/client/internal/v2/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/client/v2
go 1.22
-toolchain go1.22.3
+toolchain go1.22.4
require (
go.etcd.io/etcd/api/v3 v3.6.0-alpha.0
diff --git a/client/pkg/go.mod b/client/pkg/go.mod
index eed5bacac2d..bfdff3de7aa 100644
--- a/client/pkg/go.mod
+++ b/client/pkg/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/client/pkg/v3
go 1.22
-toolchain go1.22.3
+toolchain go1.22.4
require (
github.com/coreos/go-systemd/v22 v22.5.0
diff --git a/client/v3/go.mod b/client/v3/go.mod
index 0a0877ca846..3de64e8e39f 100644
--- a/client/v3/go.mod
+++ b/client/v3/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/client/v3
go 1.22
-toolchain go1.22.3
+toolchain go1.22.4
require (
github.com/coreos/go-semver v0.3.1
diff --git a/etcdctl/go.mod b/etcdctl/go.mod
index f2773e497f5..2b38d2a5edb 100644
--- a/etcdctl/go.mod
+++ b/etcdctl/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/etcdctl/v3
go 1.22
-toolchain go1.22.3
+toolchain go1.22.4
require (
github.com/bgentry/speakeasy v0.1.0
diff --git a/etcdutl/go.mod b/etcdutl/go.mod
index 8a06401af18..2a18d55a6d4 100644
--- a/etcdutl/go.mod
+++ b/etcdutl/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/etcdutl/v3
go 1.22
-toolchain go1.22.3
+toolchain go1.22.4
replace (
go.etcd.io/etcd/api/v3 => ../api
diff --git a/go.mod b/go.mod
index cb5093b549a..d5bd3cb7ebe 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/v3
go 1.22
-toolchain go1.22.3
+toolchain go1.22.4
replace (
go.etcd.io/etcd/api/v3 => ./api
diff --git a/pkg/go.mod b/pkg/go.mod
index 7470c282815..642490f3081 100644
--- a/pkg/go.mod
+++ b/pkg/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/pkg/v3
go 1.22
-toolchain go1.22.3
+toolchain go1.22.4
require (
github.com/creack/pty v1.1.18
diff --git a/server/go.mod b/server/go.mod
index 8c70a16c52d..c0570d91364 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/server/v3
go 1.22
-toolchain go1.22.3
+toolchain go1.22.4
require (
github.com/coreos/go-semver v0.3.1
diff --git a/tests/go.mod b/tests/go.mod
index e4816fb6ff2..0952f55b8a2 100644
--- a/tests/go.mod
+++ b/tests/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/tests/v3
go 1.22
-toolchain go1.22.3
+toolchain go1.22.4
replace (
go.etcd.io/etcd/api/v3 => ../api
diff --git a/tools/mod/go.mod b/tools/mod/go.mod
index 5764b6e01cd..f382011e048 100644
--- a/tools/mod/go.mod
+++ b/tools/mod/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/tools/v3
go 1.22.1
-toolchain go1.22.3
+toolchain go1.22.4
require (
github.com/alexfalkowski/gocovmerge v1.3.4
diff --git a/tools/rw-heatmaps/go.mod b/tools/rw-heatmaps/go.mod
index 57c54922ea4..b88fbc6a62f 100644
--- a/tools/rw-heatmaps/go.mod
+++ b/tools/rw-heatmaps/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/tools/rw-heatmaps/v3
go 1.22
-toolchain go1.22.3
+toolchain go1.22.4
require (
github.com/spf13/cobra v1.8.0
diff --git a/tools/testgrid-analysis/go.mod b/tools/testgrid-analysis/go.mod
index e5ba23b8cd7..6fc931646a3 100644
--- a/tools/testgrid-analysis/go.mod
+++ b/tools/testgrid-analysis/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/tools/testgrid-analysis/v3
go 1.22
-toolchain go1.22.3
+toolchain go1.22.4
require (
github.com/GoogleCloudPlatform/testgrid v0.0.173