phase1: enable new image building code