diff --git a/pkg/app/grpcurl.go b/pkg/app/grpcurl.go
index c8aaac36..0ad0313a 100644
--- a/pkg/app/grpcurl.go
+++ b/pkg/app/grpcurl.go
@@ -52,9 +52,12 @@ func (a *grpcurl) Uninstall(t test.TestHelper) {
 
 func (a *grpcurl) WaitReady(t test.TestHelper) {
 	t.T().Helper()
-	oc.WaitDeploymentRolloutComplete(t, a.ns, "grpcurl")
+	oc.WaitCondition(t, a.ns, "Jobs", "grpcurl", "complete")
 }
 
+// TODO: if you want to use different `grpcurl` command as
+// grpcurl -insecure -authority grpc.example.com istio-ingressgateway.istio-system:443 list
+// refactor Job to Deployments and run command via `oc exec`
 const grpcCurlTemplate = `
 apiVersion: batch/v1
 kind: Job
diff --git a/pkg/tests/ossm-federation/__debug_bin3043052675 b/pkg/tests/ossm-federation/__debug_bin3043052675
deleted file mode 100755
index b6fa645a..00000000
Binary files a/pkg/tests/ossm-federation/__debug_bin3043052675 and /dev/null differ
diff --git a/pkg/tests/tasks/traffic/ingress/grpc_https_gateway_test.go b/pkg/tests/tasks/traffic/ingress/grpc_https_gateway_test.go
index bce2b6d5..186eb284 100644
--- a/pkg/tests/tasks/traffic/ingress/grpc_https_gateway_test.go
+++ b/pkg/tests/tasks/traffic/ingress/grpc_https_gateway_test.go
@@ -81,7 +81,7 @@ func TestExposeGrpcWithHttpsGateway(t *testing.T) {
 		oc.ApplyString(t, meshNamespace, grpcurlTLSGatewayHTTPS)
 
 		t.LogStep("Install grpcurl image")
-		app.Install(t, app.GrpCurl(ns.Default))
+		app.InstallAndWaitReady(t, app.GrpCurl(ns.Default))
 
 		retry.UntilSuccessWithOptions(t, retry.Options().MaxAttempts(20), func(t test.TestHelper) {
 			oc.LogsFromPods(t,
@@ -132,7 +132,7 @@ func TestExposeGrpcWitPassthroughGateway(t *testing.T) {
 		oc.ApplyString(t, ns.EchoGrpc, grpcurlPassthroughGatewayHTTPS)
 
 		t.LogStep("Install grpcurl image")
-		app.Install(t, app.GrpCurl(ns.Default))
+		app.InstallAndWaitReady(t, app.GrpCurl(ns.Default))
 		retry.UntilSuccessWithOptions(t, retry.Options().MaxAttempts(20), func(t test.TestHelper) {
 			oc.LogsFromPods(t,
 				ns.Default,