change references to use yaml variables