Implemented review comments to use set_image_os_type