Update YAML formatting, ensure configuration watches accordingly