Finishing the refactor of the image definition in YAML