diff --git a/api/version/version.go b/api/version/version.go
index f3b389421ef..003a154af33 100644
--- a/api/version/version.go
+++ b/api/version/version.go
@@ -26,7 +26,7 @@ import (
 var (
 	// MinClusterVersion is the min cluster version this etcd binary is compatible with.
 	MinClusterVersion = "3.0.0"
-	Version           = "3.5.7"
+	Version           = "3.5.8"
 	APIVersion        = "unknown"
 
 	// Git SHA Value will be set during build
diff --git a/client/v2/go.mod b/client/v2/go.mod
index 7c03110c243..44ac0d06529 100644
--- a/client/v2/go.mod
+++ b/client/v2/go.mod
@@ -5,8 +5,8 @@ go 1.19
 require (
 	github.com/json-iterator/go v1.1.11
 	github.com/modern-go/reflect2 v1.0.1
-	go.etcd.io/etcd/api/v3 v3.5.7
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7
+	go.etcd.io/etcd/api/v3 v3.5.8
+	go.etcd.io/etcd/client/pkg/v3 v3.5.8
 )
 
 require (
diff --git a/client/v3/go.mod b/client/v3/go.mod
index f14ba71ec91..ba1bfa35905 100644
--- a/client/v3/go.mod
+++ b/client/v3/go.mod
@@ -6,8 +6,8 @@ require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/prometheus/client_golang v1.11.1
-	go.etcd.io/etcd/api/v3 v3.5.7
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7
+	go.etcd.io/etcd/api/v3 v3.5.8
+	go.etcd.io/etcd/client/pkg/v3 v3.5.8
 	go.uber.org/zap v1.17.0
 	google.golang.org/grpc v1.41.0
 	sigs.k8s.io/yaml v1.2.0
diff --git a/etcdctl/go.mod b/etcdctl/go.mod
index 1aff6f8b27b..44c55bf8ce4 100644
--- a/etcdctl/go.mod
+++ b/etcdctl/go.mod
@@ -9,12 +9,12 @@ require (
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
 	github.com/urfave/cli v1.22.4
-	go.etcd.io/etcd/api/v3 v3.5.7
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7
-	go.etcd.io/etcd/client/v2 v2.305.7
-	go.etcd.io/etcd/client/v3 v3.5.7
-	go.etcd.io/etcd/etcdutl/v3 v3.5.7
-	go.etcd.io/etcd/pkg/v3 v3.5.7
+	go.etcd.io/etcd/api/v3 v3.5.8
+	go.etcd.io/etcd/client/pkg/v3 v3.5.8
+	go.etcd.io/etcd/client/v2 v2.305.8
+	go.etcd.io/etcd/client/v3 v3.5.8
+	go.etcd.io/etcd/etcdutl/v3 v3.5.8
+	go.etcd.io/etcd/pkg/v3 v3.5.8
 	go.uber.org/zap v1.17.0
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	google.golang.org/grpc v1.41.0
@@ -46,8 +46,8 @@ require (
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
 	go.etcd.io/bbolt v1.3.7 // indirect
-	go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
-	go.etcd.io/etcd/server/v3 v3.5.7 // indirect
+	go.etcd.io/etcd/raft/v3 v3.5.8 // indirect
+	go.etcd.io/etcd/server/v3 v3.5.8 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 // indirect
 	go.opentelemetry.io/otel v1.0.1 // indirect
 	go.opentelemetry.io/otel/trace v1.0.1 // indirect
diff --git a/etcdutl/go.mod b/etcdutl/go.mod
index 6683c84b482..6fab9dd7b74 100644
--- a/etcdutl/go.mod
+++ b/etcdutl/go.mod
@@ -25,12 +25,12 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/spf13/cobra v1.1.3
 	go.etcd.io/bbolt v1.3.7
-	go.etcd.io/etcd/api/v3 v3.5.7
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7
-	go.etcd.io/etcd/client/v3 v3.5.7
-	go.etcd.io/etcd/pkg/v3 v3.5.7
-	go.etcd.io/etcd/raft/v3 v3.5.7
-	go.etcd.io/etcd/server/v3 v3.5.7
+	go.etcd.io/etcd/api/v3 v3.5.8
+	go.etcd.io/etcd/client/pkg/v3 v3.5.8
+	go.etcd.io/etcd/client/v3 v3.5.8
+	go.etcd.io/etcd/pkg/v3 v3.5.8
+	go.etcd.io/etcd/raft/v3 v3.5.8
+	go.etcd.io/etcd/server/v3 v3.5.8
 	go.uber.org/zap v1.17.0
 )
 
@@ -56,7 +56,7 @@ require (
 	github.com/prometheus/procfs v0.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
-	go.etcd.io/etcd/client/v2 v2.305.7 // indirect
+	go.etcd.io/etcd/client/v2 v2.305.8 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 // indirect
 	go.opentelemetry.io/otel v1.0.1 // indirect
 	go.opentelemetry.io/otel/trace v1.0.1 // indirect
diff --git a/go.mod b/go.mod
index 2a9e44d29b2..39310adad63 100644
--- a/go.mod
+++ b/go.mod
@@ -20,16 +20,16 @@ require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/spf13/cobra v1.1.3
 	go.etcd.io/bbolt v1.3.7
-	go.etcd.io/etcd/api/v3 v3.5.7
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7
-	go.etcd.io/etcd/client/v2 v2.305.7
-	go.etcd.io/etcd/client/v3 v3.5.7
-	go.etcd.io/etcd/etcdctl/v3 v3.5.7
-	go.etcd.io/etcd/etcdutl/v3 v3.5.7
-	go.etcd.io/etcd/pkg/v3 v3.5.7
-	go.etcd.io/etcd/raft/v3 v3.5.7
-	go.etcd.io/etcd/server/v3 v3.5.7
-	go.etcd.io/etcd/tests/v3 v3.5.7
+	go.etcd.io/etcd/api/v3 v3.5.8
+	go.etcd.io/etcd/client/pkg/v3 v3.5.8
+	go.etcd.io/etcd/client/v2 v2.305.8
+	go.etcd.io/etcd/client/v3 v3.5.8
+	go.etcd.io/etcd/etcdctl/v3 v3.5.8
+	go.etcd.io/etcd/etcdutl/v3 v3.5.8
+	go.etcd.io/etcd/pkg/v3 v3.5.8
+	go.etcd.io/etcd/raft/v3 v3.5.8
+	go.etcd.io/etcd/server/v3 v3.5.8
+	go.etcd.io/etcd/tests/v3 v3.5.8
 	go.uber.org/zap v1.17.0
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	google.golang.org/grpc v1.41.0
diff --git a/pkg/go.mod b/pkg/go.mod
index 544549183e4..223b578e1e1 100644
--- a/pkg/go.mod
+++ b/pkg/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.1
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7
+	go.etcd.io/etcd/client/pkg/v3 v3.5.8
 	go.uber.org/zap v1.17.0
 	google.golang.org/grpc v1.41.0
 )
diff --git a/raft/go.mod b/raft/go.mod
index 7fa8bf1e3a4..cb15856d4c9 100644
--- a/raft/go.mod
+++ b/raft/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/cockroachdb/datadriven v1.0.2
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.5.2
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7
+	go.etcd.io/etcd/client/pkg/v3 v3.5.8
 )
 
 require (
diff --git a/server/go.mod b/server/go.mod
index a65809562a6..864a918ab6c 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -23,12 +23,12 @@ require (
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2
 	go.etcd.io/bbolt v1.3.7
-	go.etcd.io/etcd/api/v3 v3.5.7
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7
-	go.etcd.io/etcd/client/v2 v2.305.7
-	go.etcd.io/etcd/client/v3 v3.5.7
-	go.etcd.io/etcd/pkg/v3 v3.5.7
-	go.etcd.io/etcd/raft/v3 v3.5.7
+	go.etcd.io/etcd/api/v3 v3.5.8
+	go.etcd.io/etcd/client/pkg/v3 v3.5.8
+	go.etcd.io/etcd/client/v2 v2.305.8
+	go.etcd.io/etcd/client/v3 v3.5.8
+	go.etcd.io/etcd/pkg/v3 v3.5.8
+	go.etcd.io/etcd/raft/v3 v3.5.8
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0
 	go.opentelemetry.io/otel v1.0.1
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1
diff --git a/tests/go.mod b/tests/go.mod
index d5cc7fd8ce3..330205d52c0 100644
--- a/tests/go.mod
+++ b/tests/go.mod
@@ -28,14 +28,14 @@ require (
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.1
-	go.etcd.io/etcd/api/v3 v3.5.7
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7
-	go.etcd.io/etcd/client/v2 v2.305.7
-	go.etcd.io/etcd/client/v3 v3.5.7
-	go.etcd.io/etcd/etcdutl/v3 v3.5.7
-	go.etcd.io/etcd/pkg/v3 v3.5.7
-	go.etcd.io/etcd/raft/v3 v3.5.7
-	go.etcd.io/etcd/server/v3 v3.5.7
+	go.etcd.io/etcd/api/v3 v3.5.8
+	go.etcd.io/etcd/client/pkg/v3 v3.5.8
+	go.etcd.io/etcd/client/v2 v2.305.8
+	go.etcd.io/etcd/client/v3 v3.5.8
+	go.etcd.io/etcd/etcdutl/v3 v3.5.8
+	go.etcd.io/etcd/pkg/v3 v3.5.8
+	go.etcd.io/etcd/raft/v3 v3.5.8
+	go.etcd.io/etcd/server/v3 v3.5.8
 	go.uber.org/zap v1.17.0
 	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
 	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4