Migrated from supervisor to entrypoint