Add --wait flag to ensure health checks pass before returning