diff --git a/goKMS/kms/kms.go b/goKMS/kms/kms.go
index 4d9b1cffda3909cf3dc3de778229cca69ab99e19..d9c64995ca6c6af057d89828daddae6bb8f91dc2 100644
--- a/goKMS/kms/kms.go
+++ b/goKMS/kms/kms.go
@@ -192,7 +192,7 @@ func (kms *KMS) initializePeers(config *config.Config) error {
 			return fmt.Errorf("unable to generate gRPC transport creds: %w", err)
 		}
 
-		newPeerConn, err := grpc.Dial(peer.PeerInterComAddr, grpc.WithTransportCredentials(gRPCTransportCreds))
+		newPeerConn, err := grpc.NewClient(peer.PeerInterComAddr, grpc.WithTransportCredentials(gRPCTransportCreds))
 		if err != nil {
 			return nil
 		}
@@ -598,7 +598,7 @@ func (kms *KMS) sendKSAKeysToPlatformKmsPeer(kmsPeerAddress, platformKeyID, requ
 		return fmt.Errorf("unable to generate gRPC transport creds: %w", err)
 	}
 
-	remoteConn, err := grpc.Dial(kmsPeerAddress, grpc.WithTransportCredentials(gRPCTransportCreds))
+	remoteConn, err := grpc.NewClient(kmsPeerAddress, grpc.WithTransportCredentials(gRPCTransportCreds))
 	if err != nil {
 		log.Error(err)
 		return err
diff --git a/goKMS/kms/kmsintercom.go b/goKMS/kms/kmsintercom.go
index 042461e0e4cbe9cba6aaf1a3bc60c62c38952456..73536849293eb0a918d0c4988c940439f876d0df 100644
--- a/goKMS/kms/kmsintercom.go
+++ b/goKMS/kms/kmsintercom.go
@@ -380,7 +380,7 @@ func (s *kmsTalkerServer) sendAcknowledgeKeyForwarding(ctx context.Context, remo
 		return fmt.Errorf("unable to generate gRPC transport creds: %w", err)
 	}
 
-	newPeerConn, err := grpc.Dial(remoteKmsAddr, grpc.WithTransportCredentials(gRPCTransportCreds))
+	newPeerConn, err := grpc.NewClient(remoteKmsAddr, grpc.WithTransportCredentials(gRPCTransportCreds))
 	if err != nil {
 		return err
 	}
diff --git a/quantumlayer/main/main.go b/quantumlayer/main/main.go
index 946feeb3d95a8866bf5174c8b93827742337e58a..05435b0069fe5961a0b1f6726b5b9fa21a6989db 100644
--- a/quantumlayer/main/main.go
+++ b/quantumlayer/main/main.go
@@ -87,7 +87,7 @@ func main() {
 	logrus.Info("Connecting to KMS ", config.KMSAddr)
 	var newPeerConn *grpc.ClientConn
 	for i := 0; i < connectionRetries; i++ {
-		newPeerConn, err = grpc.Dial(config.KMSAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
+		newPeerConn, err = grpc.NewClient(config.KMSAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
 		if err == nil {
 			logrus.Info("Connected to KMS")
 			break