Shuffle roles around, add cron job for discovery service