Optimize image building
Update scripts