Change allocation of a few services to make use of auto registration