Fix Image Creation on subsystems