Updated conditions for the repository selection