Put both foreaches into one target
Use correct name for all variables
Use correct naming convention for ext artifacts