While here, add options for image types and assign maintainer to submitter PR: 237658 Submitted by: Nuno Teixeira <ed.arrakis@gmail.com>