Updates new yam conf

Merged Enrique Garcia requested to merge updates_new_yam_conf into master

Merge request reports