OPAL-2041 - completed the bootstrapification, error handling and removing the last step