diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2372b40346..a2af9795607 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
   - `cortex_ingester_tsdb_head_truncations_failed_total`
   - `cortex_ingester_tsdb_head_truncations_total`
   - `cortex_ingester_tsdb_head_gc_duration_seconds`
+* [ENHANCEMENT] Enforced keepalive on all gRPC clients used for inter-service communication. #3431
 * [ENHANCEMENT] Added `cortex_alertmanager_config_hash` metric to expose hash of Alertmanager Config loaded per user. #3388
 
 ## 1.5.0 in progress
diff --git a/pkg/chunk/grpc/grpc_client.go b/pkg/chunk/grpc/grpc_client.go
index 7c9998f657f..5e7b635be71 100644
--- a/pkg/chunk/grpc/grpc_client.go
+++ b/pkg/chunk/grpc/grpc_client.go
@@ -22,7 +22,7 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
 func connectToGrpcServer(serverAddress string) (GrpcStoreClient, *grpc.ClientConn, error) {
 	params := keepalive.ClientParameters{
 		Time:                time.Second * 20,
-		Timeout:             time.Minute * 10,
+		Timeout:             time.Second * 10,
 		PermitWithoutStream: true,
 	}
 	param := grpc.WithKeepaliveParams(params)
diff --git a/pkg/util/grpcclient/grpcclient.go b/pkg/util/grpcclient/grpcclient.go
index 8a73616946b..522011fb01c 100644
--- a/pkg/util/grpcclient/grpcclient.go
+++ b/pkg/util/grpcclient/grpcclient.go
@@ -2,6 +2,7 @@ package grpcclient
 
 import (
 	"flag"
+	"time"
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
@@ -9,6 +10,7 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding/gzip"
+	"google.golang.org/grpc/keepalive"
 
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/flagext"
@@ -90,6 +92,11 @@ func (cfg *Config) DialOption(unaryClientInterceptors []grpc.UnaryClientIntercep
 		grpc.WithDefaultCallOptions(cfg.CallOptions()...),
 		grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient(unaryClientInterceptors...)),
 		grpc.WithStreamInterceptor(grpc_middleware.ChainStreamClient(streamClientInterceptors...)),
+		grpc.WithKeepaliveParams(keepalive.ClientParameters{
+			Time:                time.Second * 20,
+			Timeout:             time.Second * 10,
+			PermitWithoutStream: true,
+		}),
 	}
 }