GCP-7742 & GCP-7746 Fix validation workflow