Reduce the size of the image

Current image is about **700 MB**, these changes reduce it to **460 MB**.