Rename image_id to image and move flavor ID to a group var