Image updates and build script changes