GRILL-619 - Moved conf to a single place