Current check for if heat and env file has valid file extension i.e .yaml or .yml uses contains method of String and this could fail in some scenario. Better approach here could be to validate the file name if file ends with a particular string.