Use non-delayed repositories

Some explanations and more: