Image build script updates