Swap circus for supervisor for osiris-only