Resolve "Wait job can conflict with other resources in the cluster"

General MR

Summary

Updating Wait job to fix conflicts with other resources

Relevant logs/screenshots

(Include any relevant logs/screenshots)

Linked Issue

issue

Upgrade Notices

N/A