M058 : Update bootstrap to include eoi services