s4:setup/provision - Rework