Av refactor es.yml

PT = https://www.pivotaltracker.com/s/projects/910044/stories/59529470