diff --git a/pkg/rpc/client.go b/pkg/rpc/client.go
index a3a8ae67416..013766f5d93 100644
--- a/pkg/rpc/client.go
+++ b/pkg/rpc/client.go
@@ -93,8 +93,8 @@ var defaultClientOpts = []grpc.DialOption{
 	grpc.WithInitialConnWindowSize(8 * 1024 * 1024),
 	grpc.WithInsecure(),
 	grpc.WithKeepaliveParams(keepalive.ClientParameters{
-		Time:    2 * time.Minute,
-		Timeout: 10 * time.Second,
+		Time:    20 * time.Second,
+		Timeout: 20 * time.Second,
 	}),
 	grpc.WithStreamInterceptor(streamClientInterceptor),
 	grpc.WithUnaryInterceptor(unaryClientInterceptor),
diff --git a/pkg/rpc/server.go b/pkg/rpc/server.go
index fda6dd98c49..e083c85e883 100644
--- a/pkg/rpc/server.go
+++ b/pkg/rpc/server.go
@@ -39,7 +39,7 @@ var DefaultServerOptions = []grpc.ServerOption{
 	grpc.ConnectionTimeout(10 * time.Second),
 	grpc.InitialConnWindowSize(8 * 1024 * 1024),
 	grpc.KeepaliveEnforcementPolicy(keepalive.EnforcementPolicy{
-		MinTime: 1 * time.Minute,
+		MinTime: 30 * time.Second,
 	}),
 	grpc.KeepaliveParams(keepalive.ServerParameters{
 		MaxConnectionIdle: 5 * time.Minute,