Improve image building (primarily for discourse_dev)