diff --git a/pkg/loop/internal/net/test/simple_broker.go b/pkg/loop/internal/net/test/simple_broker.go
index 70b23d2d6..b0f98fb48 100644
--- a/pkg/loop/internal/net/test/simple_broker.go
+++ b/pkg/loop/internal/net/test/simple_broker.go
@@ -75,8 +75,7 @@ func (v *Broker) DialWithOptions(id uint32, opts ...grpc.DialOption) (conn *grpc
 		return nil, fmt.Errorf("listener with id %d does not exist", id)
 	}
 	opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	//TODO https://smartcontract-it.atlassian.net/browse/BCF-3290
-	return grpc.Dial(l.Addr().String(), opts...) //nolint:staticcheck
+	return grpc.NewClient(l.Addr().String(), opts...)
 }
 
 // NextId implements net.Broker.
diff --git a/pkg/loop/internal/relayer/pluginprovider/chainreader/test/loop_server_tester.go b/pkg/loop/internal/relayer/pluginprovider/chainreader/test/loop_server_tester.go
index ad7019a56..3f15c0301 100644
--- a/pkg/loop/internal/relayer/pluginprovider/chainreader/test/loop_server_tester.go
+++ b/pkg/loop/internal/relayer/pluginprovider/chainreader/test/loop_server_tester.go
@@ -49,12 +49,9 @@ func (lst *loopServerTester) GetConn(t *testing.T) *grpc.ClientConn {
 		return lst.conn
 	}
 
-	//TODO https://smartcontract-it.atlassian.net/browse/BCF-3290
-	//nolint:staticcheck
-	conn, err := grpc.Dial("bufnet",
+	conn, err := grpc.NewClient("bufnet",
 		grpc.WithContextDialer(func(context.Context, string) (net.Conn, error) { return lst.lis.Dial() }),
-		grpc.WithTransportCredentials(insecure.NewCredentials()),
-		grpc.WithBlock())
+		grpc.WithTransportCredentials(insecure.NewCredentials()))
 	require.NoError(t, err)
 	lst.conn = conn
 	return conn
diff --git a/pkg/loop/internal/relayerset/inprocessprovider/grpc_provider_server.go b/pkg/loop/internal/relayerset/inprocessprovider/grpc_provider_server.go
index dc0007249..fc3612d6e 100644
--- a/pkg/loop/internal/relayerset/inprocessprovider/grpc_provider_server.go
+++ b/pkg/loop/internal/relayerset/inprocessprovider/grpc_provider_server.go
@@ -38,8 +38,7 @@ func (p *ProviderServer) Close() error {
 }
 
 func (p *ProviderServer) GetConn() (grpc.ClientConnInterface, error) {
-	//TODO https://smartcontract-it.atlassian.net/browse/BCF-3290
-	cc, err := grpc.Dial(p.lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials())) //nolint:staticcheck
+	cc, err := grpc.NewClient(p.lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	p.conns = append(p.conns, cc)
 	return cc, err
 }
diff --git a/pkg/loop/internal/test/grpc_scaffold.go b/pkg/loop/internal/test/grpc_scaffold.go
index c4d63d3a2..082830ab3 100644
--- a/pkg/loop/internal/test/grpc_scaffold.go
+++ b/pkg/loop/internal/test/grpc_scaffold.go
@@ -67,8 +67,7 @@ func NewGRPCScaffold[T Client, S any](t *testing.T, serverFn SetupGRPCServer[S],
 		require.NoError(t, grpcServer.Serve(lis))
 	}()
 
-	//TODO https://smartcontract-it.atlassian.net/browse/BCF-3290
-	conn, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials())) //nolint:staticcheck
+	conn, err := grpc.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	require.NoError(t, err, "failed to dial %s", lis.Addr().String())
 	t.Cleanup(func() { require.NoError(t, conn.Close(), "failed to close connection") })
 
diff --git a/pkg/loop/telem.go b/pkg/loop/telem.go
index dcc0a67a8..61f98c654 100644
--- a/pkg/loop/telem.go
+++ b/pkg/loop/telem.go
@@ -74,9 +74,7 @@ func SetupTracing(config TracingConfig) (err error) {
 		creds = insecure.NewCredentials()
 	}
 
-	//TODO https://smartcontract-it.atlassian.net/browse/BCF-3290
-	//nolint:staticcheck
-	conn, err := grpc.DialContext(ctx, config.CollectorTarget,
+	conn, err := grpc.NewClient(config.CollectorTarget,
 		// Note the potential use of insecure transport here. TLS is recommended in production.
 		grpc.WithTransportCredentials(creds),
 		grpc.WithContextDialer(func(ctx context.Context, s string) (net.Conn, error) {