Add dynamic os/arch detection to Images