Remove hardcoded to YAML