Multitenant rework