Update yaml to mimic TJ's implementation