Reduce use of fixed repositories