Adopt new yaml location and naming