FIX image types to be used by TCs