Fix shippable config WIP