diff --git a/cloud/agent/agent.go b/cloud/agent/agent.go
index 028a7d6..c185b83 100644
--- a/cloud/agent/agent.go
+++ b/cloud/agent/agent.go
@@ -96,12 +96,12 @@
 		rootCAs.AddCert(caCert)
 	}
 
-	conn, err := grpc.Dial(agentInit.TakeoverInit.BmaasEndpoint, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{
+	conn, err := grpc.NewClient(agentInit.TakeoverInit.BmaasEndpoint, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{
 		Certificates: []tls.Certificate{*ephemeralCert},
 		RootCAs:      rootCAs,
 	})))
 	if err != nil {
-		return fmt.Errorf("error dialing BMaaS gRPC endpoint: %w", err)
+		return fmt.Errorf("error creating BMaaS gRPC client: %w", err)
 	}
 	c := bpb.NewAgentCallbackClient(conn)