Making the yml file more generic