[wip] Improve onboarding and offboarding procedures