diff --git a/main.go b/main.go
index 9016204d..d0faf7a4 100644
--- a/main.go
+++ b/main.go
@@ -227,16 +227,16 @@ func main() {
 	tlsServerConfig := tlsconfig.MTLSServerConfig(source, source, tlsconfig.AuthorizeAny())
 	tlsServerConfig.MinVersion = tls.VersionTLS12
 
-	dialOptions := []grpc.DialOption{
-		grpc.WithBlock(),
+	dialOptions := append(tracing.WithTracingDial(),
 		grpc.WithTransportCredentials(
 			grpcfd.TransportCredentials(credentials.NewTLS(tlsClientConfig))),
+		grpc.WithBlock(),
 		grpc.WithDefaultCallOptions(
 			grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(source, config.MaxTokenLifetime))),
 		),
 		grpcfd.WithChainStreamInterceptor(),
 		grpcfd.WithChainUnaryInterceptor(),
-	}
+	)
 
 	var spiffeidMap genericsync.Map[spiffeid.ID, *genericsync.Map[string, struct{}]]
 
@@ -283,7 +283,6 @@ func main() {
 		tracing.WithTracingDial(),
 		grpc.WithBlock(),
 		grpc.WithDefaultCallOptions(
-			grpc.WaitForReady(true),
 			grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(source, config.MaxTokenLifetime)))),
 		grpc.WithTransportCredentials(
 			grpcfd.TransportCredentials(